status-im
/
evmc
mirror of https://github.com/status-im/evmc.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #498 from kjx98/less_cmp 

fix less compare for address and bytes32
This commit is contained in:
Paweł Bylica 2020-01-07 16:34:17 +01:00 committed by GitHub
parent 29b494bf60 34efa10ef9
commit eb64e60621
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 26 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGELOG.md
View File

@ -17,6 +17,11 @@ and this project adheres to [Semantic Versioning].
- New **evmc command-line tool** has been added. At the moment it supports
command _run_ for executing bytecode in any EVMC-compatible VM implementation.
Try `evmc run --help` for more information.
### Fixed
- The implementation of C++ `operator<` for `evmc::address` and `evmc::bytes32` has been fixed.
[#498](https://github.com/ethereum/evmc/pull/498)
## [7.1.0] — 2019-11-29

16
include/evmc/evmc.hpp
View File

@ -161,9 +161,9 @@ constexpr bool operator<(const address& a, const address& b) noexcept
{
return load64be(&a.bytes[0]) < load64be(&b.bytes[0]) ||
(load64be(&a.bytes[0]) == load64be(&b.bytes[0]) &&
load64be(&a.bytes[8]) < load64be(&b.bytes[8])) ||
(load64be(&a.bytes[8]) == load64be(&b.bytes[8]) &&
load32be(&a.bytes[16]) < load32be(&b.bytes[16]));
(load64be(&a.bytes[8]) < load64be(&b.bytes[8]) ||
(load64be(&a.bytes[8]) == load64be(&b.bytes[8]) &&
load32be(&a.bytes[16]) < load32be(&b.bytes[16]))));
}
/// The "greater than" comparison operator for the evmc::address type.
@ -204,11 +204,11 @@ constexpr bool operator<(const bytes32& a, const bytes32& b) noexcept
{
return load64be(&a.bytes[0]) < load64be(&b.bytes[0]) ||
(load64be(&a.bytes[0]) == load64be(&b.bytes[0]) &&
load64be(&a.bytes[8]) < load64be(&b.bytes[8])) ||
(load64be(&a.bytes[8]) == load64be(&b.bytes[8]) &&
load64be(&a.bytes[16]) < load64be(&b.bytes[16])) ||
(load64be(&a.bytes[16]) == load64be(&b.bytes[16]) &&
load64be(&a.bytes[24]) < load64be(&b.bytes[24]));
(load64be(&a.bytes[8]) < load64be(&b.bytes[8]) ||
(load64be(&a.bytes[8]) == load64be(&b.bytes[8]) &&
(load64be(&a.bytes[16]) < load64be(&b.bytes[16]) ||
(load64be(&a.bytes[16]) == load64be(&b.bytes[16]) &&
load64be(&a.bytes[24]) < load64be(&b.bytes[24]))))));
}
/// The "greater than" comparison operator for the evmc::bytes32 type.

13
test/unittests/cpp_test.cpp
View File

@ -223,10 +223,17 @@ TEST(cpp, address_comparison)
auto max = evmc::address{};
std::fill_n(max.bytes, sizeof(max), uint8_t{0xff});
auto zero_max = evmc::address{};
std::fill_n(zero_max.bytes + 8, sizeof(zero_max) - 8, uint8_t{0xff});
auto max_zero = evmc::address{};
std::fill_n(max_zero.bytes, sizeof(max_zero) - 8, uint8_t{0xff});
expect_cmp(zero, zero, equal);
expect_cmp(max, max, equal);
expect_cmp(zero, max, less);
expect_cmp(max, zero, greater);
expect_cmp(zero_max, max_zero, less);
expect_cmp(max_zero, zero_max, greater);
for (size_t i = 0; i < sizeof(evmc::address); ++i)
{
@ -260,11 +267,17 @@ TEST(cpp, bytes32_comparison)
const auto zero = evmc::bytes32{};
auto max = evmc::bytes32{};
std::fill_n(max.bytes, sizeof(max), uint8_t{0xff});
auto z_max = evmc::bytes32{};
std::fill_n(z_max.bytes + 8, sizeof(max) - 8, uint8_t{0xff});
auto max_z = evmc::bytes32{};
std::fill_n(max_z.bytes, sizeof(max) - 8, uint8_t{0xff});
expect_cmp(zero, zero, equal);
expect_cmp(max, max, equal);
expect_cmp(zero, max, less);
expect_cmp(max, zero, greater);
expect_cmp(z_max, max_z, less);
expect_cmp(max_z, z_max, greater);
for (size_t i = 0; i < sizeof(evmc::bytes32); ++i)
{