Merge pull request #463 from gregdhill/refactor/vault-light

Refactor/vault light

.env

@@ -1,3 +1,4 @@
 export BITCOIN_RPC_URL=http://localhost:18443
 export BITCOIN_RPC_USER=rpcuser
 export BITCOIN_RPC_PASS=rpcpassword
+export ELECTRS_URL=http://localhost:3002

.github/workflows/cargo-test.yml

@@ -17,11 +17,6 @@ jobs:
   test:
     name: Test Suite
     runs-on: [self-hosted, linux]
-    services:
-      bitcoind:
-        image: docker.io/interlayhq/bitcoin-core:22.0
-        ports:
-          - 18443:18443
 
     strategy:
       matrix:
@@ -60,9 +55,11 @@ jobs:
         env:
           RUST_LOG: info,regalloc=warn
           BITCOIN_RPC_URL: http://127.0.0.1:18443
-          BITCOIN_RPC_USER: user
-          BITCOIN_RPC_PASS: pass
+          BITCOIN_RPC_USER: rpcuser
+          BITCOIN_RPC_PASS: rpcpassword
+          ELECTRS_URL: http://localhost:3002
         run: |
+          docker-compose up --detach
           cargo test --release --workspace --features ${{ matrix.metadata }} --features uses-bitcoind
       - name: build
         run: |

bitcoin/Cargo.toml

@@ -25,7 +25,6 @@ num-derive = "0.3"
 futures = "0.3.5"
 log = "0.4.0"
 hyper = "0.10"
-esplora-btc-api = "1.0.3"
 sha2 = "0.8.2"
 cfg-if = "1.0"
 
@@ -42,3 +41,4 @@ sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-
 mockall = "0.8.1"
 regex = "1.4.3"
 rand = "0.7"
+serial_test = "*"

bitcoin/src/electrs/error.rs

@@ -2,7 +2,7 @@ use bitcoincore_rpc::bitcoin::{
     consensus::encode::Error as BitcoinEncodeError, hashes::hex::Error as HexError,
     util::address::Error as BitcoinAddressError,
 };
-use reqwest::Error as ReqwestError;
+use reqwest::{Error as ReqwestError, StatusCode};
 use serde_json::Error as SerdeJsonError;
 use std::num::{ParseIntError, TryFromIntError};
 use thiserror::Error;
@@ -36,3 +36,9 @@ pub enum Error {
     #[error("ParseIntError: {0}")]
     ParseIntError(#[from] ParseIntError),
 }
+
+impl Error {
+    pub fn is_not_found(&self) -> bool {
+        matches!(self, Error::ReqwestError(err) if err.status().contains(&StatusCode::NOT_FOUND))
+    }
+}