Compare canonicalized paths, replace used port 8084

iotaledger · Apr 22, 2024 · 4117113 · 4117113
1 parent 1fd27b6
commit 4117113
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/.github/actions/private-tangle/setup/action.yml b/.github/actions/private-tangle/setup/action.yml
@@ -27,10 +27,10 @@ runs:
         go-version-file: "iota-core/go.mod"
         cache: false
 
-    - name: Unblock port 8084
+    - name: Replace port 8084 by 8087 as it's already used by Mono
       shell: bash
-      run: |
-        sudo kill -9 `sudo lsof -t -i:8084`
+      run: sed -i 's#8084#8087#g' docker-compose.yml
+      working-directory: iota-core/tools/docker-network
 
     - name: Setup private tangle
       shell: bash

diff --git a/sdk/src/wallet/core/operations/stronghold_backup/mod.rs b/sdk/src/wallet/core/operations/stronghold_backup/mod.rs
@@ -134,7 +134,7 @@ impl Wallet {
                 .map_err(|_| WalletError::Backup("invalid secret_manager"))?;
 
             // Copy Stronghold file so the seed is available in the new location
-            if backup_path != new_snapshot_path {
+            if backup_path.canonicalize()? != new_snapshot_path.canonicalize()? {
                 fs::copy(backup_path, new_snapshot_path)?;
             }
 
@@ -146,7 +146,7 @@ impl Wallet {
         } else {
             // If no secret manager data was in the backup, just copy the Stronghold file so the seed is available in
             // the new location.
-            if backup_path != new_snapshot_path {
+            if backup_path.canonicalize()? != new_snapshot_path.canonicalize()? {
                 fs::copy(backup_path, new_snapshot_path)?;
             }
         }
@@ -298,7 +298,7 @@ impl Wallet<StrongholdSecretManager> {
                 .map_err(|_| WalletError::Backup("invalid secret_manager"))?;
 
             // Copy Stronghold file so the seed is available in the new location
-            if backup_path != new_snapshot_path {
+            if backup_path.canonicalize()? != new_snapshot_path.canonicalize()? {
                 fs::copy(backup_path, new_snapshot_path)?;
             }