Merge pull request #25 from CounterpartyXCP/network

Accept `main` and `test` for Network, like `bitcoind` and `counterparty-server`

config_spec.toml

@@ -37,7 +37,7 @@ doc = "JSONRPC authentication cookie ('USER:PASSWORD', default: read from ~/.bit
 name = "network"
 type = "crate::config::BitcoinNetwork"
 convert_into = "::bitcoin::network::constants::Network"
-doc = "Select Bitcoin network type ('mainnet', 'testnet' or 'regtest')"
+doc = "Select Bitcoin network type ('mainnet', 'main', 'testnet', 'test', or 'regtest')"
 default = "Default::default()"
 
 [[param]]

src/config.rs

@@ -71,7 +71,11 @@ impl FromStr for BitcoinNetwork {
     type Err = <Network as FromStr>::Err;
 
     fn from_str(string: &str) -> std::result::Result<Self, Self::Err> {
-        Network::from_str(string).map(BitcoinNetwork)
+        match string {
+            "main" => Network::from_str("bitcoin").map(BitcoinNetwork),
+            "test" => Network::from_str("testnet").map(BitcoinNetwork),
+            _ => Network::from_str(string).map(BitcoinNetwork),
+        }
     }
 }