aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnthony Towns <[email protected]>2020-09-26 16:41:10 +1000
committerAnthony Towns <[email protected]>2020-09-28 12:14:19 +1000
commit4cc7171c9887e88027642927c979e507d7b78dda (patch)
tree7a02bb63aacd87b035446ba09dd9eec82b9dc954
parentscripted-diff: Replace UINT256_ONE() with uint256::ONE (diff)
downloaddiscoin-4cc7171c9887e88027642927c979e507d7b78dda.tar.xz
discoin-4cc7171c9887e88027642927c979e507d7b78dda.zip
wallet: no need for duplicate storage for ABANDON_HASH constant
-rw-r--r--src/wallet/wallet.cpp2
-rw-r--r--src/wallet/wallet.h2
2 files changed, 1 insertions, 3 deletions
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index d7a13644d..6f320096e 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -324,8 +324,6 @@ std::shared_ptr<CWallet> 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 f15712dd0..169f26698 100644
--- a/src/wallet/wallet.h
+++ b/src/wallet/wallet.h
@@ -275,7 +275,7 @@ private:
/** 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:
/**