Improve variants for parsing network (#184)

* Improve variants for parsing network

* Update changelog

* Pin lightning_encoding to not bump MSRV

CHANGELOG.md

@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Changed
+
+- Improve variants for `FromStr` network parsing ([#184](https://github.com/farcaster-project/farcaster-core/pull/184))
+
 ## [0.4.0] - 2021-11-17
 
 ### Changed

Cargo.toml

@@ -36,7 +36,7 @@ bitvec = { version = "0.22.3" }
 fixed-hash = { version = "0.7.0", default-features = false }
 hex = "0.4.3"
 inet2_addr = { version = "0.5.0", default-features = false, features = ["tor", "strict_encoding"] }
-lightning_encoding = "0.5.0-beta.3"
+lightning_encoding = "=0.5.0-beta.3"
 serde_crate = { package = "serde", version = "1", features = ["derive"], optional = true }
 strict_encoding = "1.7.4"
 strict_encoding_derive = "1.7.4"

src/blockchain.rs

@@ -292,9 +292,9 @@ impl FromStr for Network {
 
     fn from_str(s: &str) -> Result<Self, Self::Err> {
         match s {
-            "Mainnet" => Ok(Network::Mainnet),
-            "Testnet" => Ok(Network::Testnet),
-            "Local" => Ok(Network::Local),
+            "Mainnet" | "mainnet" => Ok(Network::Mainnet),
+            "Testnet" | "testnet" => Ok(Network::Testnet),
+            "Local" | "local" => Ok(Network::Local),
             _ => Err(consensus::Error::UnknownType),
         }
     }
@@ -354,6 +354,14 @@ mod tests {
         }
     }
 
+    #[test]
+    fn parse_network() {
+        for s in ["Mainnet", "mainnet", "Testnet", "testnet", "Local", "local"].iter() {
+            let parse = Network::from_str(s);
+            assert!(parse.is_ok());
+        }
+    }
+
     #[test]
     fn display_fee_strategy() {
         let strategy = FeeStrategy::Fixed(SatPerVByte::from_sat(100));