diff options
| author | Gav Wood <i@gavwood.com> | 2015-02-05 03:26:58 +0800 |
|---|---|---|
| committer | Gav Wood <i@gavwood.com> | 2015-02-05 03:26:58 +0800 |
| commit | 969366f46b83c57461fc5399fff76bd07738b6f2 (patch) | |
| tree | 714bdb106e485d79df0a769ad728cdba70edde45 | |
| parent | 8b8097ec030e4cffcbd7e30487ba8581d46782b6 (diff) | |
| download | dexon-solidity-969366f46b83c57461fc5399fff76bd07738b6f2.tar dexon-solidity-969366f46b83c57461fc5399fff76bd07738b6f2.tar.gz dexon-solidity-969366f46b83c57461fc5399fff76bd07738b6f2.tar.bz2 dexon-solidity-969366f46b83c57461fc5399fff76bd07738b6f2.tar.lz dexon-solidity-969366f46b83c57461fc5399fff76bd07738b6f2.tar.xz dexon-solidity-969366f46b83c57461fc5399fff76bd07738b6f2.tar.zst dexon-solidity-969366f46b83c57461fc5399fff76bd07738b6f2.zip | |
Move CommonJS to libethcore. Split it up ready for refactoring into
libdevcore/libdevcrypto.
| -rw-r--r-- | commonjs.cpp | 5 | ||||
| -rw-r--r-- | jsonrpc.cpp | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/commonjs.cpp b/commonjs.cpp index 860b713d..041a14f6 100644 --- a/commonjs.cpp +++ b/commonjs.cpp @@ -20,7 +20,8 @@ */ #include <boost/test/unit_test.hpp> -#include <libdevcore/CommonJS.h> +#include <libdevcore/Log.h> +#include <libethcore/CommonJS.h> BOOST_AUTO_TEST_SUITE(commonjs) using namespace std; @@ -41,7 +42,7 @@ BOOST_AUTO_TEST_CASE(jsToAddress) cnote << "Testing jsToPublic..."; KeyPair kp = KeyPair::create(); string string = toJS(kp.address()); - Address address = dev::jsToAddress(string); + Address address = dev::eth::jsToAddress(string); BOOST_CHECK_EQUAL(kp.address(), address); } diff --git a/jsonrpc.cpp b/jsonrpc.cpp index 1f0a466b..eaa9edc4 100644 --- a/jsonrpc.cpp +++ b/jsonrpc.cpp @@ -28,7 +28,7 @@ #include <boost/lexical_cast.hpp> #include <libdevcore/Log.h> #include <libdevcore/CommonIO.h> -#include <libdevcore/CommonJS.h> +#include <libethcore/CommonJS.h> #include <libwebthree/WebThree.h> #include <libweb3jsonrpc/WebThreeStubServer.h> #include <jsonrpccpp/server/connectors/httpserver.h> |