wallet: no need for duplicate storage for ABANDON_HASH constant

ajtowns · ajtowns · commit 4cc7171c9887 · 2020-09-28T12:14:19.000+10:00
diff --git 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
@@ -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:
     /**

Original file line number	Diff line number	Diff line change
`@@ -324,8 +324,6 @@ std::shared_ptr<CWallet> CreateWallet(interfaces::Chain& chain, const std::strin`
`324`	`324`	`return wallet;`
`325`	`325`	`}`
`326`	`326`
`327`		`-const uint256 CWalletTx::ABANDON_HASH(uint256::ONE);`
`328`		`-`
`329`	`327`	`/** @defgroup mapWallet`
`330`	`328`	`*`
`331`	`329`	`* @{`