diff options
author | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-05-09 16:57:06 +0200 |
---|---|---|
committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-05-09 17:03:51 +0200 |
commit | 8bcfccbc2de25e3b40d1c222d7c5d9991345a0aa (patch) | |
tree | ec29908109f159efce4c7ccb6bba68125b1d04e8 /src/test/DoS_tests.cpp | |
parent | 82564e21e79092a7e28aa5d31d8fdbdb3fd970ca (diff) | |
parent | 397668ea63e148a92f68e9fae578595585616770 (diff) | |
download | bitcoin-8bcfccbc2de25e3b40d1c222d7c5d9991345a0aa.tar.xz |
Merge pull request #4076
397668e Deduplicate uint* comparison operator logic (Pieter Wuille)
df9eb5e Move {Get,Set}Compact from bignum to uint256 (Pieter Wuille)
a703150 Add multiplication and division to uint160/uint256 (Pieter Wuille)
4d480c8 Exception instead of assigning 0 in case of wrong vector length (Pieter Wuille)
eb2cbd7 Deduplicate shared code between uint160 and uint256 (Pieter Wuille)
Diffstat (limited to 'src/test/DoS_tests.cpp')
-rw-r--r-- | src/test/DoS_tests.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/test/DoS_tests.cpp b/src/test/DoS_tests.cpp index d86cc7a290..897fb87e46 100644 --- a/src/test/DoS_tests.cpp +++ b/src/test/DoS_tests.cpp @@ -106,9 +106,9 @@ static bool CheckNBits(unsigned int nbits1, int64_t time1, unsigned int nbits2, return CheckNBits(nbits2, time2, nbits1, time1); int64_t deltaTime = time2-time1; - CBigNum required; + uint256 required; required.SetCompact(ComputeMinWork(nbits1, deltaTime)); - CBigNum have; + uint256 have; have.SetCompact(nbits2); return (have <= required); } |