Merge #268: json: add Other variant to SoftforkType

3f04a34 json: add Other variant to SoftforkType (Marko Bencun)

Pull request description:

  Fixes #267. Without this variant, a call to
  `client.get_blockchain_info()` likely fails on some versions of
  bitcoind where other types of softfork deployments were active.

ACKs for top commit:
  apoelstra:
    ACK 3f04a34
  tcharding:
    ACK 3f04a34

Tree-SHA512: d6252d6118967ac87cf26fd3caab495c16450b6e228e62d57b895438be811ac6fd05d2f1fe58ad57a6dd107e34d715c2fa408ce11da793d6e5a0af7ded5f9343

Author: apoelstra

json/src/lib.rs

@@ -878,6 +878,8 @@ pub struct Bip9SoftforkInfo {
 pub enum SoftforkType {
     Buried,
     Bip9,
+    #[serde(other)]
+    Other,
 }
 
 /// Status of a softfork
@@ -2078,3 +2080,18 @@ where
     }
     Ok(Some(res))
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_softfork_type() {
+        let buried: SoftforkType = serde_json::from_str("\"buried\"").unwrap();
+        assert_eq!(buried, SoftforkType::Buried);
+        let bip9: SoftforkType = serde_json::from_str("\"bip9\"").unwrap();
+        assert_eq!(bip9, SoftforkType::Bip9);
+        let other: SoftforkType = serde_json::from_str("\"bip8\"").unwrap();
+        assert_eq!(other, SoftforkType::Other);
+    }
+}