Use bitcoind for launching bitcoind, add github actions CI

Author: RCasatta

.github/workflows/test.yml

@@ -0,0 +1,46 @@
+name: Test
+
+on: [push]
+
+env:
+  CARGO_TERM_COLOR: always
+
+jobs:
+
+  test:
+    runs-on: ubuntu-20.04
+    strategy:
+      fail-fast: false
+      matrix:
+        features: [ "bitcoind/0_21_1", "bitcoind/0_19_1"]
+
+
+    steps:
+      - uses: actions/checkout@v2
+      - uses: Swatinem/[email protected]
+        with:
+          key: ${{ matrix.features }}
+      - uses: actions-rs/toolchain@v1
+        with:
+          toolchain: stable
+          override: true
+      - uses: actions-rs/cargo@v1
+        with:
+          command: test
+          args:  --verbose --all --features ${{ matrix.features }}
+
+  cosmetics:
+    runs-on: ubuntu-20.04
+    steps:
+      - uses: actions/checkout@v2
+      - uses: Swatinem/[email protected]
+      - uses: actions-rs/toolchain@v1
+        with:
+          toolchain: stable
+          override: true
+          profile: minimal
+          components: rustfmt, clippy
+      - name: fmt
+        run: cargo fmt -- --check
+      - name: clippy
+        run: cargo clippy -- -D warnings

Cargo.toml

@@ -3,5 +3,4 @@
 members = [
     "json",
     "client",
-    "integration_test",
 ]

client/Cargo.toml

@@ -27,3 +27,9 @@ jsonrpc = "0.12.0"
 # Used for deserialization of JSON.
 serde = "1"
 serde_json = "1"
+
+
+[dev-dependencies]
+bitcoin = { version = "0.27.0", features = ["rand"] }
+bitcoind = { version = "0.18.0" }
+lazy_static = "1.4.0"

integration_test/src/main.rs renamed to client/tests/integration.rs

@@ -14,6 +14,7 @@ extern crate bitcoin;
 extern crate core_rpc as bitcoincore_rpc;
 #[macro_use]
 extern crate lazy_static;
+extern crate bitcoind;
 extern crate log;
 
 use bitcoincore_rpc::core_rpc_json as bitcoincore_rpc_json;
@@ -34,6 +35,7 @@ use bitcoin::{
     TxIn, TxOut, Txid,
 };
 use bitcoincore_rpc_json::{GetBlockTemplateModes, GetBlockTemplateRules, ScanTxOutRequest};
+use bitcoind::{BitcoinD, P2P};
 
 lazy_static! {
     static ref SECP: secp256k1::Secp256k1<secp256k1::All> = secp256k1::Secp256k1::new();
@@ -108,25 +110,24 @@ fn sbtc<F: Into<f64>>(btc: F) -> SignedAmount {
     SignedAmount::from_btc(btc.into()).unwrap()
 }
 
-fn get_rpc_url() -> String {
-    return std::env::var("RPC_URL").expect("RPC_URL must be set");
-}
+#[test]
+fn integration_test() {
+    log::set_logger(&LOGGER).map(|()| log::set_max_level(log::LevelFilter::max())).unwrap();
 
-fn get_auth() -> bitcoincore_rpc::Auth {
-    if let Ok(cookie) = std::env::var("RPC_COOKIE") {
-        return Auth::CookieFile(cookie.into());
-    } else if let Ok(user) = std::env::var("RPC_USER") {
-        return Auth::UserPass(user, std::env::var("RPC_PASS").unwrap_or_default());
-    } else {
-        panic!("Either RPC_COOKIE or RPC_USER + RPC_PASS must be set.");
-    };
-}
+    let mut conf = bitcoind::Conf::default();
+    conf.args.push("-blockfilterindex=1");
+    conf.p2p = P2P::Yes;
+    let bitcoind =
+        bitcoind::BitcoinD::with_conf(bitcoind::downloaded_exe_path().unwrap(), &conf).unwrap();
 
-fn main() {
-    log::set_logger(&LOGGER).map(|()| log::set_max_level(log::LevelFilter::max())).unwrap();
+    let mut conf2 = bitcoind::Conf::default();
+    conf2.p2p = bitcoind.p2p_connect(true).unwrap();
+    let _bitcoind2 =
+        bitcoind::BitcoinD::with_conf(bitcoind::downloaded_exe_path().unwrap(), &conf2).unwrap();
 
-    let rpc_url = format!("{}/wallet/testwallet", get_rpc_url());
-    let cl = Client::new(&rpc_url, get_auth()).unwrap();
+    let rpc_url = bitcoind.rpc_url_with_wallet("testwallet");
+    let auth = Auth::CookieFile(bitcoind.params.cookie_file.clone());
+    let cl = Client::new(&rpc_url, auth.clone()).unwrap();
 
     test_get_network_info(&cl);
     unsafe { VERSION = cl.version().unwrap() };
@@ -183,7 +184,7 @@ fn main() {
     test_ping(&cl);
     test_get_peer_info(&cl);
     test_rescan_blockchain(&cl);
-    test_create_wallet(&cl);
+    test_create_wallet(&cl, &bitcoind);
     test_get_tx_out_set_info(&cl);
     test_get_chain_tips(&cl);
     test_get_net_totals(&cl);
@@ -203,8 +204,8 @@ fn main() {
     //TODO unload_wallet(&self, wallet: Option<&str>) -> Result<()> {
     //TODO backup_wallet(&self, destination: Option<&str>) -> Result<()> {
 
-    let rpc_url = format!("{}/wallet/testdescriptorwallet", get_rpc_url());
-    let desc_cl = Client::new(&rpc_url, get_auth()).unwrap();
+    let rpc_url = bitcoind.rpc_url_with_wallet("testdescriptorwallet");
+    let desc_cl = Client::new(&rpc_url, auth).unwrap();
 
     test_descriptor_wallet(&desc_cl);
     test_stop(cl);
@@ -900,7 +901,7 @@ fn test_rescan_blockchain(cl: &Client) {
     assert_eq!(stop, Some(count - 1));
 }
 
-fn test_create_wallet(cl: &Client) {
+fn test_create_wallet(cl: &Client, bitcoind: &BitcoinD) {
     let wallet_names = vec!["alice", "bob", "carol", "denise", "emily"];
 
     struct WalletParams<'a> {
@@ -979,8 +980,10 @@ fn test_create_wallet(cl: &Client) {
         };
         assert_eq!(result.warning, expected_warning);
 
-        let wallet_client_url = format!("{}{}{}", get_rpc_url(), "/wallet/", wallet_param.name);
-        let wallet_client = Client::new(&wallet_client_url, get_auth()).unwrap();
+        let wallet_client_url = bitcoind.rpc_url_with_wallet(wallet_param.name);
+        let auth = Auth::CookieFile(bitcoind.params.cookie_file.clone());
+
+        let wallet_client = Client::new(&wallet_client_url, auth).unwrap();
         let wallet_info = wallet_client.get_wallet_info().unwrap();
 
         assert_eq!(wallet_info.wallet_name, wallet_param.name);
@@ -1006,7 +1009,7 @@ fn test_create_wallet(cl: &Client) {
     wallet_list.retain(|w| w != "testwallet" && w != "");
 
     // Created wallets
-    assert!(wallet_list.iter().zip(wallet_names).all(|(a, b)| a == b));
+    assert!(wallet_names.iter().any(|e| wallet_list.contains(&e.to_string())));
 }
 
 fn test_get_tx_out_set_info(cl: &Client) {