Merge branch 'fix_windows_ci' into develop

BP-WG · Oct 12, 2024 · 4c639ca · 4c639ca
2 parents 3bd18c9 + fcd50f4
commit 4c639ca
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -57,6 +57,7 @@ jobs:
       matrix:
         os: [ ubuntu-22.04, ubuntu-latest, macos-13, macos-latest, windows-2019, windows-latest ]
     steps:
+      - uses: ilammy/setup-nasm@v1
       - uses: actions/checkout@v4
       - uses: dtolnay/rust-toolchain@stable
       - name: Platform ${{matrix.os}}

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -23,6 +23,7 @@ jobs:
       matrix:
         os: [ ubuntu-latest, macos-13, macos-latest, windows-latest ]
     steps:
+      - uses: ilammy/setup-nasm@v1
       - uses: actions/checkout@v4
       - uses: dtolnay/rust-toolchain@stable
       - name: Test ${{matrix.os}}

diff --git a/src/wallet.rs b/src/wallet.rs
@@ -411,8 +411,8 @@ impl<L2: Layer2Cache> CloneNoPersistence for WalletCache<L2> {
         Self {
             persistence: None,
             id: self.id.clone(),
-            last_block: self.last_block.clone(),
-            last_change: self.last_change.clone(),
+            last_block: self.last_block,
+            last_change: self.last_change,
             headers: self.headers.clone(),
             tx: self.tx.clone(),
             utxo: self.utxo.clone(),