Merge pull request #139 from stevenroose/ci-0.20

Add v0.20.0 and v0.20.1

Author: stevenroose

.travis.yml

@@ -1,14 +1,15 @@
 language: rust
 rust:
   - stable
-  - beta
   - nightly
   - 1.29.0
 env:
   - BITCOINVERSION=0.18.0
   - BITCOINVERSION=0.18.1
   - BITCOINVERSION=0.19.0.1
   - BITCOINVERSION=0.19.1
+  - BITCOINVERSION=0.20.0
+  - BITCOINVERSION=0.20.1
 
 script:
   - ./contrib/test.sh

integration_test/Cargo.toml

@@ -5,5 +5,6 @@ authors = ["Steven Roose <steven@stevenroose.org>"]
 
 [dependencies]
 bitcoincore-rpc = { path = "../client" }
-lazy_static = "1.4.0"
 bitcoin = { version = "0.23", features = [ "use-serde", "rand" ] }
+lazy_static = "1.4.0"
+log = "0.4"

integration_test/run.sh

@@ -19,11 +19,16 @@ PID1=$!
 sleep 3
 
 BLOCKFILTERARG=""
-if bitcoind -version | grep -q "0\.19"; then
+if bitcoind -version | grep -q "0\.19\|0\.20"; then
     BLOCKFILTERARG="-blockfilterindex=1"
 fi
 
-bitcoind -regtest $BLOCKFILTERARG \
+FALLBACKFEEARG=""
+if bitcoind -version | grep -q "0\.20"; then
+    FALLBACKFEEARG="-fallbackfee=0.00001000"
+fi
+
+bitcoind -regtest $BLOCKFILTERARG $FALLBACKFEEARG \
     -datadir=${TESTDIR}/2 \
     -connect=127.0.0.1:12348 \
     -rpcport=12349 \
@@ -34,7 +39,10 @@ PID2=$!
 # Let it connect to the other node.
 sleep 5
 
-RPC_URL=http://localhost:12349 RPC_COOKIE=${TESTDIR}/2/regtest/.cookie cargo run
+RPC_URL=http://localhost:12349 \
+    RPC_COOKIE=${TESTDIR}/2/regtest/.cookie \
+    cargo run
+
 RESULT=$?
 
 kill -9 $PID1 $PID2

integration_test/src/main.rs

@@ -14,6 +14,7 @@ extern crate bitcoin;
 extern crate bitcoincore_rpc;
 #[macro_use]
 extern crate lazy_static;
+extern crate log;
 
 use std::collections::HashMap;
 
@@ -41,6 +42,24 @@ lazy_static! {
     static ref FEE: Amount = Amount::from_btc(0.001).unwrap();
 }
 
+struct StdLogger;
+
+impl log::Log for StdLogger {
+    fn enabled(&self, metadata: &log::Metadata) -> bool {
+        metadata.target().contains("jsonrpc") || metadata.target().contains("bitcoincore_rpc")
+    }
+
+    fn log(&self, record: &log::Record) {
+        if self.enabled(record.metadata()) {
+            println!("[{}][{}]: {}", record.level(), record.metadata().target(), record.args());
+        }
+    }
+
+    fn flush(&self) {}
+}
+
+static LOGGER: StdLogger = StdLogger;
+
 /// Assert that the call returns a "deprecated" error.
 macro_rules! assert_deprecated {
     ($call:expr) => {
@@ -91,6 +110,8 @@ fn get_auth() -> bitcoincore_rpc::Auth {
 }
 
 fn main() {
+    log::set_logger(&LOGGER).map(|()| log::set_max_level(log::LevelFilter::max())).unwrap();
+
     let rpc_url = get_rpc_url();
     let auth = get_auth();
 
@@ -282,16 +303,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"