Drop redundant get_value_or

ryanofsky · ryanofsky · commit 2c1fbaa77195 · 2019-02-01T16:16:16.000-05:00
Suggested bitcoin#14711 (comment)
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
@@ -1722,10 +1722,10 @@ CWallet::ScanResult CWallet::ScanForWalletTransactions(const uint256& start_bloc
         }
         ShowProgress(strprintf("%s " + _("Rescanning..."), GetDisplayName()), 100); // hide progress dialog in GUI
         if (block_height && fAbortRescan) {
-            WalletLogPrintf("Rescan aborted at block %d. Progress=%f\n", block_height.get_value_or(0), progress_current);
+            WalletLogPrintf("Rescan aborted at block %d. Progress=%f\n", *block_height, progress_current);
             result.status = ScanResult::USER_ABORT;
         } else if (block_height && ShutdownRequested()) {
-            WalletLogPrintf("Rescan interrupted by shutdown request at block %d. Progress=%f\n", block_height.get_value_or(0), progress_current);
+            WalletLogPrintf("Rescan interrupted by shutdown request at block %d. Progress=%f\n", *block_height, progress_current);
             result.status = ScanResult::USER_ABORT;
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -1722,10 +1722,10 @@ CWallet::ScanResult CWallet::ScanForWalletTransactions(const uint256& start_bloc`
`1722`	`1722`	`}`
`1723`	`1723`	`ShowProgress(strprintf("%s " + _("Rescanning..."), GetDisplayName()), 100); // hide progress dialog in GUI`
`1724`	`1724`	`if (block_height && fAbortRescan) {`
`1725`		`- WalletLogPrintf("Rescan aborted at block %d. Progress=%f\n", block_height.get_value_or(0), progress_current);`
	`1725`	`+ WalletLogPrintf("Rescan aborted at block %d. Progress=%f\n", *block_height, progress_current);`
`1726`	`1726`	`result.status = ScanResult::USER_ABORT;`
`1727`	`1727`	`} else if (block_height && ShutdownRequested()) {`
`1728`		`- WalletLogPrintf("Rescan interrupted by shutdown request at block %d. Progress=%f\n", block_height.get_value_or(0), progress_current);`
	`1728`	`+ WalletLogPrintf("Rescan interrupted by shutdown request at block %d. Progress=%f\n", *block_height, progress_current);`
`1729`	`1729`	`result.status = ScanResult::USER_ABORT;`
`1730`	`1730`	`}`
`1731`	`1731`	`}`