diff options
| author | Anthony Towns <[email protected]> | 2020-09-26 16:01:56 +1000 |
|---|---|---|
| committer | Anthony Towns <[email protected]> | 2020-09-28 12:14:19 +1000 |
| commit | 82cf4641f4a161834d07ce83c18982d9b143c040 (patch) | |
| tree | 8fea48359235ca8a911346f1551e1b08e06daa8e /src | |
| parent | uint256: Update constructors to c++11, make ONE static (diff) | |
| download | discoin-82cf4641f4a161834d07ce83c18982d9b143c040.tar.xz discoin-82cf4641f4a161834d07ce83c18982d9b143c040.zip | |
scripted-diff: Replace UINT256_ONE() with uint256::ONE
-BEGIN VERIFY SCRIPT-
sed -i '/inline.* UINT256_ONE() {/,+1d' src/uint256.h
sed -i 's/UINT256_ONE()/uint256::ONE/' $(git grep -l UINT256_ONE)
-END VERIFY SCRIPT-
Diffstat (limited to 'src')
| -rw-r--r-- | src/script/interpreter.cpp | 2 | ||||
| -rw-r--r-- | src/test/sighash_tests.cpp | 4 | ||||
| -rw-r--r-- | src/uint256.h | 2 | ||||
| -rw-r--r-- | src/wallet/scriptpubkeyman.cpp | 2 | ||||
| -rw-r--r-- | src/wallet/wallet.cpp | 2 |
5 files changed, 5 insertions, 7 deletions
diff --git a/src/script/interpreter.cpp b/src/script/interpreter.cpp index 7b2457a5e..50a619247 100644 --- a/src/script/interpreter.cpp +++ b/src/script/interpreter.cpp @@ -1375,7 +1375,7 @@ uint256 SignatureHash(const CScript& scriptCode, const T& txTo, unsigned int nIn if ((nHashType & 0x1f) == SIGHASH_SINGLE) { if (nIn >= txTo.vout.size()) { // nOut out of range - return UINT256_ONE(); + return uint256::ONE; } } diff --git a/src/test/sighash_tests.cpp b/src/test/sighash_tests.cpp index c0bb92258..bc862de78 100644 --- a/src/test/sighash_tests.cpp +++ b/src/test/sighash_tests.cpp @@ -28,7 +28,7 @@ uint256 static SignatureHashOld(CScript scriptCode, const CTransaction& txTo, un { if (nIn >= txTo.vin.size()) { - return UINT256_ONE(); + return uint256::ONE; } CMutableTransaction txTmp(txTo); @@ -58,7 +58,7 @@ uint256 static SignatureHashOld(CScript scriptCode, const CTransaction& txTo, un unsigned int nOut = nIn; if (nOut >= txTmp.vout.size()) { - return UINT256_ONE(); + return uint256::ONE; } txTmp.vout.resize(nOut+1); for (unsigned int i = 0; i < nOut; i++) diff --git a/src/uint256.h b/src/uint256.h index 3e245763b..c55cb3145 100644 --- a/src/uint256.h +++ b/src/uint256.h @@ -150,6 +150,4 @@ inline uint256 uint256S(const std::string& str) return rv; } -inline const uint256& UINT256_ONE() { return uint256::ONE; } - #endif // BITCOIN_UINT256_H diff --git a/src/wallet/scriptpubkeyman.cpp b/src/wallet/scriptpubkeyman.cpp index 51715462c..435716e56 100644 --- a/src/wallet/scriptpubkeyman.cpp +++ b/src/wallet/scriptpubkeyman.cpp @@ -655,7 +655,7 @@ std::unique_ptr<CKeyMetadata> LegacyScriptPubKeyMan::GetMetadata(const CTxDestin uint256 LegacyScriptPubKeyMan::GetID() const { - return UINT256_ONE(); + return uint256::ONE; } /** diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp index 66857dbb3..d7a13644d 100644 --- a/src/wallet/wallet.cpp +++ b/src/wallet/wallet.cpp @@ -324,7 +324,7 @@ std::shared_ptr<CWallet> CreateWallet(interfaces::Chain& chain, const std::strin return wallet; } -const uint256 CWalletTx::ABANDON_HASH(UINT256_ONE()); +const uint256 CWalletTx::ABANDON_HASH(uint256::ONE); /** @defgroup mapWallet * |