Change getaddressinfo label type for v0.20.0

Author: stevenroose

integration_test/src/main.rs

@@ -301,16 +301,33 @@ fn test_get_address_info(cl: &Client) {
     assert!(!info.hex.unwrap().is_empty());
 }
 
+#[allow(deprecated)]
 fn test_set_label(cl: &Client) {
     let addr = cl.get_new_address(Some("label"), None).unwrap();
     let info = cl.get_address_info(&addr).unwrap();
-    assert_eq!(&info.label, "label");
-    assert_eq!(info.labels[0].name, "label");
+    if version() >= 0_20_00_00 {
+        assert!(info.label.is_none());
+        assert_eq!(info.labels[0], json::GetAddressInfoResultLabel::Simple("label".into()));
+    } else {
+        assert_eq!(info.label.as_ref().unwrap(), "label");
+        assert_eq!(info.labels[0], json::GetAddressInfoResultLabel::WithPurpose {
+            name: "label".into(),
+            purpose: json::GetAddressInfoResultLabelPurpose::Receive,
+        });
+    }
 
     cl.set_label(&addr, "other").unwrap();
     let info = cl.get_address_info(&addr).unwrap();
-    assert_eq!(&info.label, "other");
-    assert_eq!(info.labels[0].name, "other");
+    if version() >= 0_20_00_00 {
+        assert!(info.label.is_none());
+        assert_eq!(info.labels[0], json::GetAddressInfoResultLabel::Simple("other".into()));
+    } else {
+        assert_eq!(info.label.as_ref().unwrap(), "other");
+        assert_eq!(info.labels[0], json::GetAddressInfoResultLabel::WithPurpose {
+            name: "other".into(),
+            purpose: json::GetAddressInfoResultLabelPurpose::Receive,
+        });
+    }
 }
 
 fn test_send_to_address(cl: &Client) {

json/src/lib.rs

@@ -646,9 +646,13 @@ pub enum GetAddressInfoResultLabelPurpose {
 }
 
 #[derive(Clone, PartialEq, Eq, Debug, Deserialize, Serialize)]
-pub struct GetAddressInfoResultLabel {
-    pub name: String,
-    pub purpose: GetAddressInfoResultLabelPurpose,
+#[serde(untagged)]
+pub enum GetAddressInfoResultLabel {
+    Simple(String),
+    WithPurpose {
+        name: String,
+        purpose: GetAddressInfoResultLabelPurpose,
+    }
 }
 
 #[derive(Clone, PartialEq, Eq, Debug, Deserialize, Serialize)]
@@ -679,13 +683,15 @@ pub struct GetAddressInfoResult {
     pub embedded: Option<GetAddressInfoResultEmbedded>,
     #[serde(rename = "is_compressed")]
     pub is_compressed: Option<bool>,
-    pub label: String,
     pub timestamp: Option<u64>,
     #[serde(rename = "hdkeypath")]
     pub hd_key_path: Option<bip32::DerivationPath>,
     #[serde(rename = "hdseedid")]
     pub hd_seed_id: Option<bitcoin::XpubIdentifier>,
     pub labels: Vec<GetAddressInfoResultLabel>,
+    /// Deprecated in v0.20.0. See `labels` field instead.
+    #[deprecated(note = "since Core v0.20.0")]
+    pub label: Option<String>,
 }
 
 /// Models the result of "getblockchaininfo"