wallet: Use chain.lock() instead of temporary chain.assumeLocked()

practicalswift · practicalswift · commit 593a8e8a2ce1 · 2019-05-16T21:42:34.000+02:00
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
@@ -4074,7 +4074,7 @@ std::shared_ptr<CWallet> CWallet::CreateWalletFromFile(interfaces::Chain& chain,
             return nullptr;
         }
 
-        auto locked_chain = chain.assumeLocked();  // Temporary. Removed in upcoming lock cleanup
+        auto locked_chain = chain.lock();
         walletInstance->ChainStateFlushed(locked_chain->getTipLocator());
     } else if (wallet_creation_flags & WALLET_FLAG_DISABLE_PRIVATE_KEYS) {
         // Make it impossible to disable private keys after creation

Original file line number	Diff line number	Diff line change
`@@ -4074,7 +4074,7 @@ std::shared_ptr<CWallet> CWallet::CreateWalletFromFile(interfaces::Chain& chain,`
`4074`	`4074`	`return nullptr;`
`4075`	`4075`	`}`
`4076`	`4076`
`4077`		`- auto locked_chain = chain.assumeLocked(); // Temporary. Removed in upcoming lock cleanup`
	`4077`	`+ auto locked_chain = chain.lock();`
`4078`	`4078`	`walletInstance->ChainStateFlushed(locked_chain->getTipLocator());`
`4079`	`4079`	`} else if (wallet_creation_flags & WALLET_FLAG_DISABLE_PRIVATE_KEYS) {`
`4080`	`4080`	`// Make it impossible to disable private keys after creation`