diff options
| author | Gav Wood <i@gavwood.com> | 2015-03-05 18:09:34 +0800 |
|---|---|---|
| committer | Gav Wood <i@gavwood.com> | 2015-03-06 19:46:24 +0800 |
| commit | d004f81f3a870c31db9333755ce0d96f8ae81784 (patch) | |
| tree | 947e284658a5d5790630fc6daacbdf72a5e295d2 | |
| parent | 1a31a9aa73c88cea8de46413c2f07dd9a532a59d (diff) | |
| download | dexon-solidity-d004f81f3a870c31db9333755ce0d96f8ae81784.tar.gz dexon-solidity-d004f81f3a870c31db9333755ce0d96f8ae81784.tar.zst dexon-solidity-d004f81f3a870c31db9333755ce0d96f8ae81784.zip | |
Bunch of repotting/curating.
[10:59:28] Vitalik Buterin: block.parent.gas_limit * 1023 / 1024 <=
block.gas_limit <= block.parent.gas_limit * 1025/1024
| -rw-r--r-- | MemTrie.cpp | 2 | ||||
| -rw-r--r-- | TrieHash.cpp | 2 | ||||
| -rw-r--r-- | commonjs.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/MemTrie.cpp b/MemTrie.cpp index c3a44e1e..ab5a13b6 100644 --- a/MemTrie.cpp +++ b/MemTrie.cpp @@ -23,7 +23,7 @@ #include <libdevcrypto/TrieCommon.h> #include <libdevcrypto/SHA3.h> -#include <libethcore/CommonEth.h> +#include <libethcore/Common.h> using namespace std; using namespace dev; using namespace dev::eth; diff --git a/TrieHash.cpp b/TrieHash.cpp index ee4f2e87..ccf12c16 100644 --- a/TrieHash.cpp +++ b/TrieHash.cpp @@ -23,7 +23,7 @@ #include <libdevcrypto/TrieCommon.h> #include <libdevcrypto/SHA3.h> -#include <libethcore/CommonEth.h> +#include <libethcore/Common.h> using namespace std; using namespace dev; using namespace dev::eth; diff --git a/commonjs.cpp b/commonjs.cpp index 041a14f6..72582c54 100644 --- a/commonjs.cpp +++ b/commonjs.cpp @@ -42,7 +42,7 @@ BOOST_AUTO_TEST_CASE(jsToAddress) cnote << "Testing jsToPublic..."; KeyPair kp = KeyPair::create(); string string = toJS(kp.address()); - Address address = dev::eth::jsToAddress(string); + Address address = dev::jsToAddress(string); BOOST_CHECK_EQUAL(kp.address(), address); } |