mirrors/bitcoinj
1
0
Fork 0
mirror of https://github.com/bitcoinj/bitcoinj.git synced 2025-03-13 11:36:15 +01:00
Code Issues Projects Releases Packages Wiki Activity

NetworkParameters: remove deprecated constants and methods related to BIP70

Browse source
This commit is contained in:
Andreas Schildbach 2025-02-28 01:34:13 +01:00
parent 75dbe77080
commit aa9eaf9af7
3 changed files with 0 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
core/src/main/java/org/bitcoinj/core/NetworkParameters.java
View file

@ -26,7 +26,6 @@ import org.bitcoinj.base.Sha256Hash;
import org.bitcoinj.crypto.DumpedPrivateKey;
import org.bitcoinj.params.BitcoinNetworkParams;
import org.bitcoinj.params.Networks;
import org.bitcoinj.protocols.payments.PaymentProtocol;
import org.bitcoinj.script.Script;
import org.bitcoinj.store.BlockStore;
import org.bitcoinj.store.BlockStoreException;
@ -50,22 +49,6 @@ import java.util.Objects;
* them, you are encouraged to call the static get() methods on each specific params class directly.</p>
*/
public abstract class NetworkParameters {
/** The string used by the payment protocol to represent the main net. */
@Deprecated
public static final String PAYMENT_PROTOCOL_ID_MAINNET = PaymentProtocol.PAYMENT_PROTOCOL_ID_MAINNET;
/** The string used by the payment protocol to represent the test net. */
@Deprecated
public static final String PAYMENT_PROTOCOL_ID_TESTNET = PaymentProtocol.PAYMENT_PROTOCOL_ID_TESTNET;
/** The string used by the payment protocol to represent signet (note that this is non-standard). */
@Deprecated
public static final String PAYMENT_PROTOCOL_ID_SIGNET = PaymentProtocol.PAYMENT_PROTOCOL_ID_SIGNET;
/** The string used by the payment protocol to represent unit testing (note that this is non-standard). */
@Deprecated
public static final String PAYMENT_PROTOCOL_ID_UNIT_TESTS = PaymentProtocol.PAYMENT_PROTOCOL_ID_UNIT_TESTS;
@Deprecated
public static final String PAYMENT_PROTOCOL_ID_REGTEST = PaymentProtocol.PAYMENT_PROTOCOL_ID_REGTEST;
// TODO: Seed nodes should be here as well.
protected BigInteger maxTarget;
@ -149,13 +132,6 @@ public abstract class NetworkParameters {
return network;
}
/**
* @return the payment protocol network id string
* @deprecated Use {@link PaymentProtocol#protocolIdFromParams(NetworkParameters)}
*/
@Deprecated
public abstract String getPaymentProtocolId();
@Override
public boolean equals(Object o) {
if (this == o) return true;
@ -194,18 +170,6 @@ public abstract class NetworkParameters {
: Networks.find(network).orElseThrow(() -> new IllegalArgumentException("Unknown network"));
}
/**
* Return network parameters for a paymentProtocol ID string
* @param pmtProtocolId paymentProtocol ID string
* @return network parameters for the given string paymentProtocolID or NULL if not recognized
* @deprecated Use {@link PaymentProtocol#paramsFromPmtProtocolID(String)} (String)}
*/
@Nullable
@Deprecated
public static NetworkParameters fromPmtProtocolID(String pmtProtocolId) {
return PaymentProtocol.paramsFromPmtProtocolID(pmtProtocolId);
}
public int getSpendableCoinbaseDepth() {
return spendableCoinbaseDepth;
}

10
core/src/main/java/org/bitcoinj/params/BitcoinNetworkParams.java
View file

@ -29,7 +29,6 @@ import org.bitcoinj.base.Sha256Hash;
import org.bitcoinj.core.ProtocolVersion;
import org.bitcoinj.core.StoredBlock;
import org.bitcoinj.core.VerificationException;
import org.bitcoinj.protocols.payments.PaymentProtocol;
import org.bitcoinj.store.BlockStore;
import org.bitcoinj.store.BlockStoreException;
import org.bitcoinj.base.utils.MonetaryFormat;
@ -117,15 +116,6 @@ public abstract class BitcoinNetworkParams extends NetworkParameters {
}
}
/**
* @return the payment protocol network id string
* @deprecated Use {@link PaymentProtocol#protocolIdFromParams(NetworkParameters)}
*/
@Deprecated
public String getPaymentProtocolId() {
return PaymentProtocol.protocolIdFromParams(this);
}
/**
* Checks if we are at a reward halving point.
* @param previousHeight The height of the previous stored block

5
core/src/main/java/org/bitcoinj/testing/MockAltNetworkParams.java
View file

@ -39,11 +39,6 @@ public class MockAltNetworkParams extends NetworkParameters {
p2shHeader = 5;
}
@Override
public String getPaymentProtocolId() {
return null;
}
@Override
public void checkDifficultyTransitions(StoredBlock storedPrev, Block next, BlockStore blockStore) throws VerificationException, BlockStoreException {