From 57bbb9152b0e60c010e657712293ed90407a9f8f Mon Sep 17 00:00:00 2001 From: Mike Hearn Date: Thu, 8 Jan 2015 18:35:11 +0100 Subject: [PATCH] Give regtest a payment protocol ID too. --- core/src/main/java/org/bitcoinj/core/NetworkParameters.java | 3 +++ core/src/main/java/org/bitcoinj/params/RegTestParams.java | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/core/src/main/java/org/bitcoinj/core/NetworkParameters.java b/core/src/main/java/org/bitcoinj/core/NetworkParameters.java index 7db7f772..eee374e7 100644 --- a/core/src/main/java/org/bitcoinj/core/NetworkParameters.java +++ b/core/src/main/java/org/bitcoinj/core/NetworkParameters.java @@ -64,6 +64,7 @@ public abstract class NetworkParameters implements Serializable { public static final String PAYMENT_PROTOCOL_ID_TESTNET = "test"; /** The string used by the payment protocol to represent unit testing (note that this is non-standard). */ public static final String PAYMENT_PROTOCOL_ID_UNIT_TESTS = "unittest"; + public static final String PAYMENT_PROTOCOL_ID_REGTEST = "regtest"; // TODO: Seed nodes should be here as well. @@ -228,6 +229,8 @@ public abstract class NetworkParameters implements Serializable { return TestNet3Params.get(); } else if (pmtProtocolId.equals(PAYMENT_PROTOCOL_ID_UNIT_TESTS)) { return UnitTestParams.get(); + } else if (pmtProtocolId.equals(PAYMENT_PROTOCOL_ID_REGTEST)) { + return RegTestParams.get(); } else { return null; } diff --git a/core/src/main/java/org/bitcoinj/params/RegTestParams.java b/core/src/main/java/org/bitcoinj/params/RegTestParams.java index eeb460ac..c77cf723 100644 --- a/core/src/main/java/org/bitcoinj/params/RegTestParams.java +++ b/core/src/main/java/org/bitcoinj/params/RegTestParams.java @@ -68,6 +68,6 @@ public class RegTestParams extends TestNet2Params { @Override public String getPaymentProtocolId() { - return null; + return PAYMENT_PROTOCOL_ID_REGTEST; } }