From 1ea30fb4ae374ba469cad6be88e8cd6452861972 Mon Sep 17 00:00:00 2001 From: Chris Beams Date: Thu, 6 Nov 2014 08:53:38 +0100 Subject: [PATCH] Clarify concept of 'default network' in BitcoinModule --- src/main/java/io/bitsquare/btc/BitcoinModule.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/main/java/io/bitsquare/btc/BitcoinModule.java b/src/main/java/io/bitsquare/btc/BitcoinModule.java index a9601b4adc..c08f2eb562 100644 --- a/src/main/java/io/bitsquare/btc/BitcoinModule.java +++ b/src/main/java/io/bitsquare/btc/BitcoinModule.java @@ -30,15 +30,17 @@ import java.util.Properties; public class BitcoinModule extends AbstractBitsquareModule { - private final BitcoinNetwork defaultNetwork; + private static final BitcoinNetwork DEFAULT_NETWORK = BitcoinNetwork.REGTEST; + + private final BitcoinNetwork network; public BitcoinModule(Properties properties) { - this(properties, BitcoinNetwork.REGTEST); + this(properties, DEFAULT_NETWORK); } - public BitcoinModule(Properties properties, BitcoinNetwork defaultNetwork) { + public BitcoinModule(Properties properties, BitcoinNetwork network) { super(properties); - this.defaultNetwork = defaultNetwork; + this.network = network; } @Override @@ -55,7 +57,7 @@ public class BitcoinModule extends AbstractBitsquareModule { } private NetworkParameters network() { - String networkName = properties.getProperty("networkType", defaultNetwork.name()); + String networkName = properties.getProperty("networkType", network.name()); switch (BitcoinNetwork.valueOf(networkName.toUpperCase())) { case MAINNET: