cerc-io/solidity
16
0
Fork 0
mirror of https://github.com/ethereum/solidity synced 2023-10-03 13:03:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ethrpc separated && first tests

Browse Source
This commit is contained in:
Marek Kotewicz 2014-10-13 12:28:53 +02:00
parent 96f5f40dd8
commit d47f9be775
2 changed files with 26 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -17,7 +17,7 @@ target_link_libraries(testeth ${CRYPTOPP_LS})
target_link_libraries(testeth webthree) target_link_libraries(testeth webthree)
if(JSONRPC_LS) if(JSONRPC_LS)
target_link_libraries(testeth ${JSONRPC_LS}) target_link_libraries(testeth ethrpc)
endif() endif()
if ("${TARGET_PLATFORM}" STREQUAL "w64") if ("${TARGET_PLATFORM}" STREQUAL "w64")

39
jsonrpc.cpp
View File

@ -5,9 +5,11 @@
#include <boost/test/unit_test.hpp> #include <boost/test/unit_test.hpp>
#include <libdevcore/Log.h> #include <libdevcore/Log.h>
#include <libdevcore/CommonIO.h> #include <libdevcore/CommonIO.h>
#include <libdevcore/CommonJS.h>
#include <libwebthree/WebThree.h> #include <libwebthree/WebThree.h>
#include <eth/EthStubServer.h> #include <libethrpc/EthStubServer.h>
#include <jsonrpc/connectors/httpserver.h> #include <jsonrpc/connectors/httpserver.h>
#include <jsonrpc/connectors/httpclient.h>
#include "JsonSpiritHeaders.h" #include "JsonSpiritHeaders.h"
#include "ethstubclient.h" #include "ethstubclient.h"
@ -17,11 +19,11 @@ using namespace dev::eth;
namespace js = json_spirit; namespace js = json_spirit;
namespace jsonrpc_tests { namespace jsonrpc_tests {
KeyPair us;
auto_ptr<EthStubServer> jsonrpcServer; auto_ptr<EthStubServer> jsonrpcServer;
auto_ptr<EthStubClient> jsonrpcClient;
struct JsonrpcFixture { struct JsonrpcFixture {
@ -32,7 +34,13 @@ struct JsonrpcFixture {
string dbPath; string dbPath;
dev::WebThreeDirect web3(name, dbPath); dev::WebThreeDirect web3(name, dbPath);
web3.setIdealPeerCount(5); web3.setIdealPeerCount(5);
us = KeyPair::create();
jsonrpcServer = auto_ptr<EthStubServer>(new EthStubServer(new jsonrpc::HttpServer(8080), web3)); jsonrpcServer = auto_ptr<EthStubServer>(new EthStubServer(new jsonrpc::HttpServer(8080), web3));
jsonrpcServer->setKeys({us});
jsonrpcServer->StartListening();
jsonrpcClient = auto_ptr<EthStubClient>(new EthStubClient(new jsonrpc::HttpClient("http://localhost:8080")));
} }
~JsonrpcFixture() ~JsonrpcFixture()
{ {
@ -40,27 +48,26 @@ struct JsonrpcFixture {
} }
}; };
//BOOST_AUTO_TEST_CASE(jsonrpc_test)
//{
// cnote << "testing jsonrpc";
// js::mValue v;
// string s = asString(contents("../../jsonrpc.json"));
// BOOST_REQUIRE_MESSAGE(s.length() > 0, "Content from 'jsonrpc.json' is empty. Have you cloned the 'tests' repo branch develop?");
// js::read_string(s, v);
//}
BOOST_GLOBAL_FIXTURE(JsonrpcFixture) BOOST_GLOBAL_FIXTURE(JsonrpcFixture)
BOOST_AUTO_TEST_CASE( test_case1 ) BOOST_AUTO_TEST_CASE(jsonrpc_key)
{ {
// BOOST_CHECK( i == 1 ); cnote << "Testing jsonrpc key...";
Json::Value key = jsonrpcClient->key();
BOOST_CHECK_EQUAL(key.isString(), true);
BOOST_CHECK_EQUAL(jsToSecret(key.asString()), us.secret());
} }
BOOST_AUTO_TEST_CASE( test_case2 ) BOOST_AUTO_TEST_CASE(jsonrpc_keys)
{ {
// BOOST_CHECK_EQUAL( i, 0 ); cnote << "Testing jsonrpc keys...";
Json::Value keys = jsonrpcClient->keys();
BOOST_CHECK_EQUAL(keys.isArray(), true);
BOOST_CHECK_EQUAL(keys.size(), 1);
BOOST_CHECK_EQUAL(jsToSecret(keys[0u].asString()) , us.secret());
} }
} }
#endif #endif