Merge remote-tracking branch 'origin/kip-10-mutual-tx' into kip-10-mu…

…tual-tx # Conflicts: # crypto/txscript/src/data_stack.rs # crypto/txscript/src/lib.rs
kaspanet · Jun 16, 2024 · f0da1c1 · f0da1c1
2 parents f1e0d3c + ff25568
commit f0da1c1
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 13 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -8,7 +8,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout sources
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Install Protoc
         uses: arduino/setup-protoc@v3
@@ -19,7 +19,7 @@ jobs:
         uses: dtolnay/rust-toolchain@stable
 
       - name: Cache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: |
             ~/.cargo/bin/
@@ -80,7 +80,7 @@ jobs:
           swap-storage: true
 
       - name: Checkout sources
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Fix CRLF on Windows
         if: runner.os == 'Windows'
@@ -101,7 +101,7 @@ jobs:
         run: cargo install cargo-nextest
 
       - name: Cache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: |
             ~/.cargo/bin/
@@ -180,7 +180,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout sources
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Install Protoc
         uses: arduino/setup-protoc@v3
@@ -193,7 +193,7 @@ jobs:
           components: rustfmt, clippy
 
       - name: Cache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: |
             ~/.cargo/bin/
@@ -215,7 +215,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout sources
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Install Protoc
         uses: arduino/setup-protoc@v3
@@ -252,7 +252,7 @@ jobs:
         run: rustup target add wasm32-unknown-unknown
 
       - name: Cache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: |
             ~/.cargo/bin/
@@ -278,7 +278,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout sources
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Install Protoc
         uses: arduino/setup-protoc@v3
@@ -326,7 +326,7 @@ jobs:
         run: npm install --global typedoc typescript
 
       - name: Cache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: |
             ~/.cargo/bin/
@@ -344,7 +344,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout sources
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Install Protoc
         uses: arduino/setup-protoc@v3
@@ -355,7 +355,7 @@ jobs:
         uses: dtolnay/rust-toolchain@stable
 
       - name: Cache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: |
             ~/.cargo/bin/

diff --git a/notify/src/address/tracker.rs b/notify/src/address/tracker.rs
@@ -111,7 +111,6 @@ impl Indexer for CounterMap {
 
 #[cfg(test)]
 #[derive(Debug, Clone)]
-#[cfg(test)]
 pub struct Counter {
     pub index: Index,
     pub count: RefCount,

diff --git a/rpc/macros/src/handler.rs b/rpc/macros/src/handler.rs
@@ -7,6 +7,7 @@ use syn::{Attribute, Error, Expr, ExprArray, Result};
 pub struct Handler {
     pub name: String,
     pub fn_call: Ident,
+    #[allow(dead_code)]
     pub fn_with_suffix: Option<Ident>,
     pub fn_no_suffix: Ident,
     pub fn_camel: Ident,

diff --git a/wallet/macros/src/handler.rs b/wallet/macros/src/handler.rs
@@ -10,10 +10,12 @@ use xxhash_rust::xxh32::xxh32;
 #[derive(Debug)]
 pub struct Handler {
     pub name: String,
+    #[allow(dead_code)]
     pub hash_32: Literal,
     pub hash_64: Literal,
     pub ident: Literal,
     pub fn_call: Ident,
+    #[allow(dead_code)]
     pub fn_with_suffix: Option<Ident>,
     pub fn_no_suffix: Ident,
     pub fn_camel: Ident,