Debug

achow101 · Jan 12, 2024 · ad737a6 · ad737a6
1 parent cb57ea6
commit ad737a6
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -288,4 +288,4 @@ jobs:
       - name: Run functional tests
         env:
           TEST_RUNNER_EXTRA: ${{ github.event_name != 'pull_request' && '--extended' || '' }}
-        run: py -3 test\functional\test_runner.py --jobs $env:NUMBER_OF_PROCESSORS --ci --quiet --tmpdirprefix=$env:RUNNER_TEMP --combinedlogslen=99999999 --timeout-factor=$env:TEST_RUNNER_TIMEOUT_FACTOR $env:TEST_RUNNER_EXTRA
+        run: py -3 test\functional\test_runner.py --jobs $env:NUMBER_OF_PROCESSORS --ci --quiet --tmpdirprefix=$env:RUNNER_TEMP --combinedlogslen=99999999 --timeout-factor=$env:TEST_RUNNER_TIMEOUT_FACTOR $env:TEST_RUNNER_EXTRA "wallet_assumeutxo.py --descriptors"
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
@@ -507,7 +507,16 @@ std::shared_ptr<CWallet> RestoreWallet(WalletContext& context, const fs::path& b
         error += strprintf(Untranslated("Unexpected exception: %s"), e.what());
     }
     if (!wallet) {
-        fs::remove_all(wallet_path);
+        for (int i = 0; i < 10; ++i) {
+            std::error_code ec;
+            fs::remove_all(wallet_path, ec);
+            if (ec) {
+                LogError("Failed to remove restored wallet: %d, %s", ec.value(), ec.message());
+                UninterruptibleSleep(std::chrono::milliseconds{100});
+            } else {
+                break;
+            }
+        }
     }
 
     return wallet;
@@ -3099,6 +3108,7 @@ std::shared_ptr<CWallet> CWallet::Create(WalletContext& context, const std::stri
     if (time_first_key) walletInstance->MaybeUpdateBirthTime(*time_first_key);
 
     if (chain && !AttachChain(walletInstance, *chain, rescan_required, error, warnings)) {
+        walletInstance->WalletLogPrintf("Failed to attach chain: %s\n", error.original);
         return nullptr;
     }