Remove unused pwalletdb from CommitTransaction

furszy · furszy · commit 5e155b4ca0f8 · 2020-08-01T12:52:07.000-03:00
Coming from btc@5723bb44ce2c6bb14114aa7f211160702a47ac91
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
@@ -2947,11 +2947,6 @@ CWallet::CommitResult CWallet::CommitTransaction(CWalletTx& wtxNew, CReserveKey&
         LOCK2(cs_main, cs_wallet);
         LogPrintf("%s:\n%s", __func__, wtxNew.ToString());
         {
-            // This is only to keep the database open to defeat the auto-flush for the
-            // duration of this scope.  This is the only place where this optimization
-            // maybe makes sense; please don't do it anywhere else.
-            CWalletDB* pwalletdb = fFileBacked ? new CWalletDB(strWalletFile, "r+") : NULL;
-
             // Take key pair from key pool so it won't be used again
             reservekey.KeepKey();
 
@@ -2972,9 +2967,6 @@ CWallet::CommitResult CWallet::CommitTransaction(CWalletTx& wtxNew, CReserveKey&
                     updated_hashes.insert(txin.prevout.hash);
                 }
             }
-
-            if (fFileBacked)
-                delete pwalletdb;
         }
 
         res.hashTx = wtxNew.GetHash();

Original file line number	Diff line number	Diff line change
`@@ -2947,11 +2947,6 @@ CWallet::CommitResult CWallet::CommitTransaction(CWalletTx& wtxNew, CReserveKey&`
`2947`	`2947`	`LOCK2(cs_main, cs_wallet);`
`2948`	`2948`	`LogPrintf("%s:\n%s", __func__, wtxNew.ToString());`
`2949`	`2949`	`{`
`2950`		`- // This is only to keep the database open to defeat the auto-flush for the`
`2951`		`- // duration of this scope. This is the only place where this optimization`
`2952`		`- // maybe makes sense; please don't do it anywhere else.`
`2953`		`- CWalletDB* pwalletdb = fFileBacked ? new CWalletDB(strWalletFile, "r+") : NULL;`
`2954`		`-`
`2955`	`2950`	`// Take key pair from key pool so it won't be used again`
`2956`	`2951`	`reservekey.KeepKey();`
`2957`	`2952`
`@@ -2972,9 +2967,6 @@ CWallet::CommitResult CWallet::CommitTransaction(CWalletTx& wtxNew, CReserveKey&`
`2972`	`2967`	`updated_hashes.insert(txin.prevout.hash);`
`2973`	`2968`	`}`
`2974`	`2969`	`}`
`2975`		`-`
`2976`		`- if (fFileBacked)`
`2977`		`- delete pwalletdb;`
`2978`	`2970`	`}`
`2979`	`2971`
`2980`	`2972`	`res.hashTx = wtxNew.GetHash();`