From 4cc7171c9887e88027642927c979e507d7b78dda Mon Sep 17 00:00:00 2001 From: Anthony Towns Date: Sat, 26 Sep 2020 16:41:10 +1000 Subject: [PATCH] wallet: no need for duplicate storage for ABANDON_HASH constant --- src/wallet/wallet.cpp | 2 -- src/wallet/wallet.h | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp index d7a13644df..6f320096eb 100644 --- a/src/wallet/wallet.cpp +++ b/src/wallet/wallet.cpp @@ -324,8 +324,6 @@ std::shared_ptr CreateWallet(interfaces::Chain& chain, const std::strin return wallet; } -const uint256 CWalletTx::ABANDON_HASH(uint256::ONE); - /** @defgroup mapWallet * * @{ diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h index f15712dd0e..169f266980 100644 --- a/src/wallet/wallet.h +++ b/src/wallet/wallet.h @@ -275,7 +275,7 @@ class CWalletTx /** Constant used in hashBlock to indicate tx has been abandoned, only used at * serialization/deserialization to avoid ambiguity with conflicted. */ - static const uint256 ABANDON_HASH; + static constexpr const uint256& ABANDON_HASH = uint256::ONE; public: /**