mirrors/bitcoinj
1
0
Fork 0
mirror of https://github.com/bitcoinj/bitcoinj.git synced 2025-02-21 14:04:16 +01:00
Code Issues Projects Releases Packages Wiki Activity

BitcoinNetwork: allow a number of common alternate network names in fromString()

Browse source 
Also adds tests.
This commit is contained in:
Andreas Schildbach 2022-07-11 10:39:36 +02:00
parent 60bad143ff
commit 932a871f86
2 changed files with 28 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
core/src/main/java/org/bitcoinj/base/BitcoinNetwork.java
View file

@ -32,10 +32,10 @@ import static org.bitcoinj.base.Coin.COIN;
* method for input of network values.
*/
public enum BitcoinNetwork implements Network {
MAIN("org.bitcoin.production"),
TEST("org.bitcoin.test"),
SIGNET("org.bitcoin.signet"),
REGTEST("org.bitcoin.regtest");
MAIN("org.bitcoin.production", new String[] { "mainnet", "prod" }),
TEST("org.bitcoin.test", new String[] { "testnet" }),
SIGNET("org.bitcoin.signet", new String[] { "sig" }),
REGTEST("org.bitcoin.regtest", new String[0]);
/**
* The maximum number of coins to be generated
@ -59,9 +59,11 @@ public enum BitcoinNetwork implements Network {
public static final String ID_UNITTESTNET = "org.bitcoinj.unittest";
private final String id;
private final String[] alternateNames;
BitcoinNetwork(String networkId) {
id = networkId;
BitcoinNetwork(String networkId, String[] alternateNames) {
this.id = networkId;
this.alternateNames = alternateNames;
}
/**
@ -94,16 +96,30 @@ public enum BitcoinNetwork implements Network {
}
/**
* Find the {@code BitcoinNetwork} from a name String.
* @param nameString A name string (e.g. "main", "test", "signet")
* Find the {@code BitcoinNetwork} from a name string, e.g. "main", "test" or "signet".
* A number of common alternate names are allowed too, e.g. "mainnet" or "prod".
* @param nameString A name string
* @return An {@code Optional} containing the matching enum or empty
*/
public static Optional<BitcoinNetwork> fromString(String nameString) {
final Optional<BitcoinNetwork> canonicalName = findCanonicalName(nameString);
return canonicalName.isPresent()
? canonicalName
: findAlternateName(nameString);
}
private static Optional<BitcoinNetwork> findCanonicalName(String nameString) {
return Arrays.stream(values())
.filter(n -> n.toString().equals(nameString))
.findFirst();
}
private static Optional<BitcoinNetwork> findAlternateName(String nameString) {
return Arrays.stream(values())
.filter(n -> Arrays.stream(n.alternateNames).anyMatch(a -> a.equals(nameString)))
.findFirst();
}
/**
* Find the {@code BitcoinNetwork} from an ID String
* <p>

4
core/src/test/java/org/bitcoinj/base/BitcoinNetworkTest.java
View file

@ -42,9 +42,13 @@ public class BitcoinNetworkTest {
@Test
public void fromString() {
assertEquals(BitcoinNetwork.MAIN, BitcoinNetwork.fromString("mainnet").get());
assertEquals(BitcoinNetwork.MAIN, BitcoinNetwork.fromString("main").get());
assertEquals(BitcoinNetwork.MAIN, BitcoinNetwork.fromString("prod").get());
assertEquals(BitcoinNetwork.TEST, BitcoinNetwork.fromString("test").get());
assertEquals(BitcoinNetwork.TEST, BitcoinNetwork.fromString("testnet").get());
assertEquals(BitcoinNetwork.SIGNET, BitcoinNetwork.fromString("signet").get());
assertEquals(BitcoinNetwork.SIGNET, BitcoinNetwork.fromString("sig").get());
assertEquals(BitcoinNetwork.REGTEST, BitcoinNetwork.fromString("regtest").get());
}