Use electrs and simple wallet in integration tests

.github/workflows/rust.yml

@@ -52,9 +52,11 @@ jobs:
           path: target/debug/deps
           key: test-cache-${{ github.run_id }}-${{ github.run_number }}
       - name: Start bitcoin node
-        run: ./scripts/start_node.sh
+        run: docker-compose up -d
       - name: Wait for container to run
         run: ./scripts/wait_for_container.sh bitcoin-node
+      - name: Wait for electrs to be ready
+        run: ./scripts/wait_for_electrs.sh
       - name: Run test
         run: RUST_BACKTRACE=1 ${{ matrix.tests }} --ignored
       - name: Stop bitcoin node

Cargo.toml

@@ -12,4 +12,5 @@ members = [
   "sample",
   "simple-wallet",
   "dlc-sled-storage-provider",
+  "electrs-blockchain-provider",
 ]

bitcoin-rpc-provider/Cargo.toml

@@ -12,3 +12,4 @@ dlc-manager = {version = "0.3.0", path = "../dlc-manager"}
 lightning = {version = "0.0.112"}
 log = "0.4.14"
 rust-bitcoin-coin-selection = {version = "0.1.0", git = "https://github.com/p2pderivatives/rust-bitcoin-coin-selection", features = ["rand"]}
+simple-wallet = {path = "../simple-wallet"}

bitcoin-test-utils/src/rpc_helpers.rs

@@ -16,7 +16,22 @@ pub fn get_new_wallet_rpc(
     wallet_name: &str,
     auth: Auth,
 ) -> Result<Client, bitcoincore_rpc::Error> {
-    default_rpc.create_wallet(wallet_name, Some(false), None, None, None)?;
+    let wallet_list = {
+        let mut retry_count = 20;
+        loop {
+            if let Ok(wallets) = default_rpc.list_wallets() {
+                break wallets;
+            }
+            std::thread::sleep(std::time::Duration::from_millis(200));
+            if retry_count == 0 {
+                panic!("Could not get wallet list.");
+            }
+            retry_count -= 1;
+        }
+    };
+    if !wallet_list.contains(&wallet_name.to_owned()) {
+        default_rpc.create_wallet(wallet_name, Some(false), None, None, None)?;
+    }
     let rpc_url = format!("{}/wallet/{}", rpc_base(), wallet_name);
     Client::new(&rpc_url, auth)
 }
@@ -59,7 +74,7 @@ pub fn init_clients() -> (Client, Client, Client) {
 
     sink_rpc.generate_to_address(1, &offer_address).unwrap();
     sink_rpc.generate_to_address(1, &accept_address).unwrap();
-    sink_rpc.generate_to_address(100, &sink_address).unwrap();
+    sink_rpc.generate_to_address(101, &sink_address).unwrap();
 
     (offer_rpc, accept_rpc, sink_rpc)
 }

dlc-manager/Cargo.toml

@@ -15,11 +15,11 @@ use-serde = ["serde", "dlc/use-serde", "dlc-messages/serde", "dlc-trie/use-serde
 
 [dependencies]
 async-trait = "0.1.50"
-bitcoin = {version = "0.29.2" }
+bitcoin = {version = "0.29.2"}
 dlc = {version = "0.3.0", path = "../dlc"}
 dlc-messages = {version = "0.3.0", path = "../dlc-messages"}
 dlc-trie = {version = "0.3.0", path = "../dlc-trie"}
-lightning = {version = "0.0.112" }
+lightning = {version = "0.0.112"}
 log = "0.4.14"
 rand_chacha = {version = "0.3.1", optional = true}
 secp256k1-zkp = {version = "0.7.0", features = ["bitcoin_hashes", "rand", "rand-std"]}
@@ -28,16 +28,18 @@ serde = {version = "1.0", optional = true}
 [dev-dependencies]
 bitcoin-rpc-provider = {path = "../bitcoin-rpc-provider"}
 bitcoin-test-utils = {path = "../bitcoin-test-utils"}
-bitcoincore-rpc = {version = "0.16.0" }
-bitcoincore-rpc-json = {version = "0.16.0" }
+bitcoincore-rpc = {version = "0.16.0"}
+bitcoincore-rpc-json = {version = "0.16.0"}
 criterion = "0.4.0"
 dlc-manager = {path = ".", features = ["use-serde"]}
 dlc-messages = {path = "../dlc-messages", features = ["serde"]}
+electrs-blockchain-provider = {path = "../electrs-blockchain-provider"}
 env_logger = "0.9.1"
 mocks = {path = "../mocks"}
 secp256k1-zkp = {version = "0.7.0", features = ["bitcoin_hashes", "rand", "rand-std", "global-context", "use-serde"]}
 serde = "1.0"
 serde_json = "1.0"
+simple-wallet = {path = "../simple-wallet"}
 
 [[bench]]
 harness = false