Refactor for stable + btc

chainwayxyz · Jan 4, 2024 · d60f2d0 · d60f2d0
1 parent c788b48
commit d60f2d0
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 4 deletions.
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
@@ -53,8 +53,8 @@ env:
   CARGO_TERM_COLOR: always
   RUSTFLAGS: -D warnings
   EXCLUDE_BTC: 1
-  RUST_VERSION_STABLE: 1.75.0
-  RUST_VERSION_BETA: 1.76.0
+#   RUST_VERSION_STABLE: 1.75.0
+#   RUST_VERSION_BETA: 1.76.0
   # RUST_VERSION_NIGHTLY: nightly-2023-12-31
 
 
@@ -82,7 +82,7 @@ jobs:
       - name: Install Rust
         uses: actions-rs/toolchain@v1
         with:
-          toolchain: beta
+          toolchain: stable
           # toolchain: "1.76.0"
           # target: "x86_64-unknown-linux-gnu"
           override: true
@@ -105,6 +105,8 @@ jobs:
             .
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - name: Set toolchain stable
+        run: rustup override set stable
       - name: Run lint
         run: |
           if ! SKIP_GUEST_BUILD=1 make lint ; then

diff --git a/adapters/bitcoin/src/rpc.rs b/adapters/bitcoin/src/rpc.rs
@@ -307,6 +307,9 @@ mod tests {
 
     #[tokio::test]
     async fn get_utxos() {
+        if std::env::var("EXCLUDE_BTC").is_ok() {
+            return;
+        }
         let node = get_bitcoin_node();
 
         let utxos = node.get_utxos().await.unwrap();
@@ -318,6 +321,9 @@ mod tests {
 
     #[tokio::test]
     async fn list_wallets() {
+        if std::env::var("EXCLUDE_BTC").is_ok() {
+            return;
+        }
         let node = get_bitcoin_node();
 
         let wallets = node.list_wallets().await.unwrap();

diff --git a/adapters/bitcoin/src/service.rs b/adapters/bitcoin/src/service.rs
@@ -483,6 +483,9 @@ mod tests {
 
     #[tokio::test]
     async fn get_finalized_header() {
+        if std::env::var("EXCLUDE_BTC").is_ok() {
+            return;
+        }
         let da_service = get_service().await;
 
         let get_curr_header = da_service
@@ -551,6 +554,9 @@ mod tests {
 
     #[tokio::test]
     async fn get_block_at() {
+        if std::env::var("EXCLUDE_BTC").is_ok() {
+            return;
+        }
         let da_service = get_service().await;
 
         da_service
@@ -561,6 +567,9 @@ mod tests {
 
     #[tokio::test]
     async fn extract_relevant_blobs() {
+        if std::env::var("EXCLUDE_BTC").is_ok() {
+            return;
+        }
         let da_service = get_service().await;
 
         let block = da_service
@@ -578,6 +587,9 @@ mod tests {
 
     #[tokio::test]
     async fn extract_relevant_blobs_with_proof() {
+        if std::env::var("EXCLUDE_BTC").is_ok() {
+            return;
+        }
         let da_service = get_service().await;
 
         let block = da_service
@@ -650,6 +662,9 @@ mod tests {
 
     #[tokio::test]
     async fn send_transaction() {
+        if std::env::var("EXCLUDE_BTC").is_ok() {
+            return;
+        }
         let da_service = get_service().await;
 
         let blob = "01000000b60000002adbd76606f2bd4125080e6f44df7ba2d728409955c80b8438eb1828ddf23e3c12188eeac7ecf6323be0ed5668e21cc354fca90d8bca513d6c0a240c26afa7007b758bf2e7670fafaf6bf0015ce0ff5aa802306fc7e3f45762853ffc37180fe64a0000000001fea6ac5b8751120fb62fff67b54d2eac66aef307c7dde1d394dea1e09e43dd44c800000000000000135d23aee8cb15c890831ff36db170157acaac31df9bba6cd40e7329e608eabd0000000000000000";
@@ -661,6 +676,9 @@ mod tests {
 
     #[tokio::test]
     async fn send_transaction_with_fee_rate() {
+        if std::env::var("EXCLUDE_BTC").is_ok() {
+            return;
+        }
         let da_service = get_service().await;
         let fee_rate = da_service
             .client
@@ -681,6 +699,9 @@ mod tests {
 
     #[tokio::test]
     async fn check_signature() {
+        if std::env::var("EXCLUDE_BTC").is_ok() {
+            return;
+        }
         let rpc = BitcoinNode::new(
             "http://localhost:38332".to_string(),
             "chainway".to_string(),

diff --git a/module-system/sov-modules-macros/tests/rpc/expose_rpc_associated_type_not_static.stderr b/module-system/sov-modules-macros/tests/rpc/expose_rpc_associated_type_not_static.stderr
@@ -11,4 +11,4 @@ error[E0310]: the parameter type `S` may not live long enough
 help: consider adding an explicit lifetime bound
    |
 101| struct Runtime<C: Context, S: TestSpec + 'static> {
-   |                                        +++++++++
+   |                                        +++++++++