chore: use docker-compose for integration tests

Signed-off-by: Gregory Hill <[email protected]>
interlay · Mar 28, 2023 · 6145739 · 6145739
1 parent 326909f
commit 6145739
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 12 deletions.
diff --git a/.github/workflows/cargo-test.yml b/.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:
@@ -62,7 +57,9 @@ jobs:
           BITCOIN_RPC_URL: http://127.0.0.1:18443
           BITCOIN_RPC_USER: user
           BITCOIN_RPC_PASS: pass
+          ELECTRS_URL: http://localhost:3002
         run: |
+          docker-compose up --detach
           cargo test --release --workspace --features ${{ matrix.metadata }} --features uses-bitcoind
       - name: build
         run: |

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/bitcoin/tests/electrs.rs b/bitcoin/tests/electrs.rs
@@ -1,4 +1,4 @@
-// #![cfg(feature = "uses-bitcoind")]
+#![cfg(feature = "uses-bitcoind")]
 
 use bitcoin::{
     secp256k1::{constants::SECRET_KEY_SIZE, Secp256k1},

diff --git a/vault/src/execution.rs b/vault/src/execution.rs
@@ -563,7 +563,10 @@ pub async fn execute_open_requests(
     // or just pay and execute all requests individually
     for (id, request) in open_requests {
         // try finding transaction directly (if supported)
-        match read_only_btc_rpc.get_tx_for_op_return(request.btc_address, request.amount, id).await {
+        match read_only_btc_rpc
+            .get_tx_for_op_return(request.btc_address, request.amount, id)
+            .await
+        {
             Ok(Some(txid)) => {
                 create_payment_worker(
                     shutdown_tx.clone(),