wallet: no need for duplicate storage for ABANDON_HASH constant

apoelstra · Sep 28, 2020 · 4cc7171 · 4cc7171
1 parent 82cf464
commit 4cc7171
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
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 change
@@ Expand Up @@
         return wallet;
     }
-    const uint256 CWalletTx::ABANDON_HASH(uint256::ONE);
     /** @defgroup mapWallet
      *
      * @{
@@ Expand Down @@