retab

1 files changed, 137 insertions, 137 deletions

diff --git a/jsonrpc.cpp b/jsonrpc.cpp
index 814ed308..be03dbea 100644
--- a/jsonrpc.cpp
+++ b/jsonrpc.cpp
@@ -52,32 +52,32 @@ auto_ptr<EthStubClient> jsonrpcClient;
 
 
 struct JsonrpcFixture  {
-    JsonrpcFixture()
-    {
-        cnote << "setup jsonrpc";
-
-        web3.setIdealPeerCount(5);
-        web3.ethereum()->setForceMining(true);
-        jsonrpcServer = auto_ptr<EthStubServer>(new EthStubServer(new jsonrpc::CorsHttpServer(8080), web3));
-        jsonrpcServer->StartListening();
-        
-        jsonrpcClient = auto_ptr<EthStubClient>(new EthStubClient(new jsonrpc::HttpClient("http://localhost:8080")));
-    }
-    ~JsonrpcFixture()
-    {
-        cnote << "teardown jsonrpc";
-    }
+	JsonrpcFixture()
+	{
+		cnote << "setup jsonrpc";
+
+		web3.setIdealPeerCount(5);
+		web3.ethereum()->setForceMining(true);
+		jsonrpcServer = auto_ptr<EthStubServer>(new EthStubServer(new jsonrpc::CorsHttpServer(8080), web3));
+		jsonrpcServer->StartListening();
+		
+		jsonrpcClient = auto_ptr<EthStubClient>(new EthStubClient(new jsonrpc::HttpClient("http://localhost:8080")));
+	}
+	~JsonrpcFixture()
+	{
+		cnote << "teardown jsonrpc";
+	}
 };
-    
+
 BOOST_GLOBAL_FIXTURE(JsonrpcFixture)
 
 BOOST_AUTO_TEST_CASE(jsonrpc_balanceAt)
 {
-    cnote << "Testing jsonrpc balanceAt...";
-    dev::KeyPair key = KeyPair::create();
-    auto address = key.address();
-    string balance = jsonrpcClient->balanceAt(toJS(address), 0);
-    BOOST_CHECK_EQUAL(toJS(web3.ethereum()->balanceAt(address)), balance);
+	cnote << "Testing jsonrpc balanceAt...";
+	dev::KeyPair key = KeyPair::create();
+	auto address = key.address();
+	string balance = jsonrpcClient->balanceAt(toJS(address), 0);
+	BOOST_CHECK_EQUAL(toJS(web3.ethereum()->balanceAt(address)), balance);
 }
 
 BOOST_AUTO_TEST_CASE(jsonrpc_call)
@@ -86,57 +86,57 @@ BOOST_AUTO_TEST_CASE(jsonrpc_call)
 
 BOOST_AUTO_TEST_CASE(jsonrpc_coinbase)
 {
-    cnote << "Testing jsonrpc coinbase...";
-    string coinbase = jsonrpcClient->coinbase();
-    BOOST_CHECK_EQUAL(jsToAddress(coinbase), web3.ethereum()->address());
+	cnote << "Testing jsonrpc coinbase...";
+	string coinbase = jsonrpcClient->coinbase();
+	BOOST_CHECK_EQUAL(jsToAddress(coinbase), web3.ethereum()->address());
 }
 
 BOOST_AUTO_TEST_CASE(jsonrpc_countAt)
 {
-    cnote << "Testing jsonrpc countAt...";
-    dev::KeyPair key = KeyPair::create();
-    auto address = key.address();
-    double countAt = jsonrpcClient->countAt(toJS(address), 0);
-    BOOST_CHECK_EQUAL(countAt, (double)(uint64_t)web3.ethereum()->countAt(address, 0));
+	cnote << "Testing jsonrpc countAt...";
+	dev::KeyPair key = KeyPair::create();
+	auto address = key.address();
+	double countAt = jsonrpcClient->countAt(toJS(address), 0);
+	BOOST_CHECK_EQUAL(countAt, (double)(uint64_t)web3.ethereum()->countAt(address, 0));
 }
 
 BOOST_AUTO_TEST_CASE(jsonrpc_defaultBlock)
 {
-    cnote << "Testing jsonrpc defaultBlock...";
-    int defaultBlock = jsonrpcClient->defaultBlock();
-    BOOST_CHECK_EQUAL(defaultBlock, web3.ethereum()->getDefault());
+	cnote << "Testing jsonrpc defaultBlock...";
+	int defaultBlock = jsonrpcClient->defaultBlock();
+	BOOST_CHECK_EQUAL(defaultBlock, web3.ethereum()->getDefault());
 }
-    
+
 BOOST_AUTO_TEST_CASE(jsonrpc_fromAscii)
 {
-    cnote << "Testing jsonrpc fromAscii...";
-    string testString = "1234567890987654";
-    string fromAscii = jsonrpcClient->fromAscii(32, testString);
-    BOOST_CHECK_EQUAL(fromAscii, jsFromBinary(testString, 32));
+	cnote << "Testing jsonrpc fromAscii...";
+	string testString = "1234567890987654";
+	string fromAscii = jsonrpcClient->fromAscii(32, testString);
+	BOOST_CHECK_EQUAL(fromAscii, jsFromBinary(testString, 32));
 
 }
 
 BOOST_AUTO_TEST_CASE(jsonrpc_fromFixed)
 {
-    cnote << "Testing jsonrpc fromFixed...";
-    string testString = "0x1234567890987654";
-    double fromFixed = jsonrpcClient->fromFixed(testString);
+	cnote << "Testing jsonrpc fromFixed...";
+	string testString = "0x1234567890987654";
+	double fromFixed = jsonrpcClient->fromFixed(testString);
 	double ff = jsFromFixed(testString);
 	string str1 = boost::lexical_cast<string> (fromFixed);
 	string str2 = boost::lexical_cast<string> (ff);
-    BOOST_CHECK_EQUAL(str1.substr(0, 3), str2.substr(0, 3));
+	BOOST_CHECK_EQUAL(str1.substr(0, 3), str2.substr(0, 3));
 }
 
 BOOST_AUTO_TEST_CASE(jsonrpc_gasPrice)
 {
-    cnote << "Testing jsonrpc gasPrice...";
-    string gasPrice = jsonrpcClient->gasPrice();
-    BOOST_CHECK_EQUAL(gasPrice, toJS(10 * dev::eth::szabo));
+	cnote << "Testing jsonrpc gasPrice...";
+	string gasPrice = jsonrpcClient->gasPrice();
+	BOOST_CHECK_EQUAL(gasPrice, toJS(10 * dev::eth::szabo));
 }
 
 BOOST_AUTO_TEST_CASE(jsonrpc_isListening)
 {
-    cnote << "Testing jsonrpc isListening...";
+	cnote << "Testing jsonrpc isListening...";
 
 	web3.startNetwork();
 	bool listeningOn = jsonrpcClient->listening();
@@ -149,38 +149,38 @@ BOOST_AUTO_TEST_CASE(jsonrpc_isListening)
 
 BOOST_AUTO_TEST_CASE(jsonrpc_isMining)
 {
-    cnote << "Testing jsonrpc isMining...";
+	cnote << "Testing jsonrpc isMining...";
 
-    web3.ethereum()->startMining();
-    bool miningOn = jsonrpcClient->mining();
-    BOOST_CHECK_EQUAL(miningOn, web3.ethereum()->isMining());
+	web3.ethereum()->startMining();
+	bool miningOn = jsonrpcClient->mining();
+	BOOST_CHECK_EQUAL(miningOn, web3.ethereum()->isMining());
 
-    web3.ethereum()->stopMining();
-    bool miningOff = jsonrpcClient->mining();
-    BOOST_CHECK_EQUAL(miningOff, web3.ethereum()->isMining());
+	web3.ethereum()->stopMining();
+	bool miningOff = jsonrpcClient->mining();
+	BOOST_CHECK_EQUAL(miningOff, web3.ethereum()->isMining());
 }
 
 BOOST_AUTO_TEST_CASE(jsonrpc_key)
 {
-    cnote << "Testing jsonrpc key...";
-    dev::KeyPair key = KeyPair::create();
-    jsonrpcServer->setKeys({key});
-    string clientSecret = jsonrpcClient->key();
-    jsonrpcServer->setKeys({});
-    BOOST_CHECK_EQUAL(jsToSecret(clientSecret), key.secret());
+	cnote << "Testing jsonrpc key...";
+	dev::KeyPair key = KeyPair::create();
+	jsonrpcServer->setKeys({key});
+	string clientSecret = jsonrpcClient->key();
+	jsonrpcServer->setKeys({});
+	BOOST_CHECK_EQUAL(jsToSecret(clientSecret), key.secret());
 }
-    
+
 BOOST_AUTO_TEST_CASE(jsonrpc_keys)
 {
-    cnote << "Testing jsonrpc keys...";
-    std::vector <dev::KeyPair> keys = {KeyPair::create(), KeyPair::create()};
-    jsonrpcServer->setKeys(keys);
-    Json::Value k = jsonrpcClient->keys();
-    jsonrpcServer->setKeys({});
-    BOOST_CHECK_EQUAL(k.isArray(), true);
-    BOOST_CHECK_EQUAL(k.size(),  keys.size());
-    for (unsigned i = 0; i < k.size(); i++)
-        BOOST_CHECK_EQUAL(jsToSecret(k[i].asString()) , keys[i].secret());
+	cnote << "Testing jsonrpc keys...";
+	std::vector <dev::KeyPair> keys = {KeyPair::create(), KeyPair::create()};
+	jsonrpcServer->setKeys(keys);
+	Json::Value k = jsonrpcClient->keys();
+	jsonrpcServer->setKeys({});
+	BOOST_CHECK_EQUAL(k.isArray(), true);
+	BOOST_CHECK_EQUAL(k.size(),  keys.size());
+	for (unsigned i = 0; i < k.size(); i++)
+		BOOST_CHECK_EQUAL(jsToSecret(k[i].asString()) , keys[i].secret());
 }
 
 BOOST_AUTO_TEST_CASE(jsonrpc_messages)
@@ -201,33 +201,33 @@ BOOST_AUTO_TEST_CASE(jsonrpc_number)
 
 BOOST_AUTO_TEST_CASE(jsonrpc_number2)
 {
-    cnote << "Testing jsonrpc number2...";
-    int number = jsonrpcClient->number();
-    BOOST_CHECK_EQUAL(number, web3.ethereum()->number() + 1);
-    dev::eth::mine(*(web3.ethereum()), 1);
-    int numberAfter = jsonrpcClient->number();
-    BOOST_CHECK_EQUAL(number + 1, numberAfter);
-    BOOST_CHECK_EQUAL(numberAfter, web3.ethereum()->number() + 1);
+	cnote << "Testing jsonrpc number2...";
+	int number = jsonrpcClient->number();
+	BOOST_CHECK_EQUAL(number, web3.ethereum()->number() + 1);
+	dev::eth::mine(*(web3.ethereum()), 1);
+	int numberAfter = jsonrpcClient->number();
+	BOOST_CHECK_EQUAL(number + 1, numberAfter);
+	BOOST_CHECK_EQUAL(numberAfter, web3.ethereum()->number() + 1);
 }
 
 BOOST_AUTO_TEST_CASE(jsonrpc_peerCount)
 {
-    cnote << "Testing jsonrpc peerCount...";
+	cnote << "Testing jsonrpc peerCount...";
 	int peerCount = jsonrpcClient->peerCount();
 	BOOST_CHECK_EQUAL(web3.peerCount(), peerCount);
 }
 
 BOOST_AUTO_TEST_CASE(jsonrpc_secretToAddress)
 {
-    cnote << "Testing jsonrpc secretToAddress...";
-    dev::KeyPair pair = dev::KeyPair::create();
-    string address = jsonrpcClient->secretToAddress(toJS(pair.secret()));
-    BOOST_CHECK_EQUAL(jsToAddress(address), pair.address());
+	cnote << "Testing jsonrpc secretToAddress...";
+	dev::KeyPair pair = dev::KeyPair::create();
+	string address = jsonrpcClient->secretToAddress(toJS(pair.secret()));
+	BOOST_CHECK_EQUAL(jsToAddress(address), pair.address());
 }
 
 BOOST_AUTO_TEST_CASE(jsonrpc_setListening)
 {
-    cnote << "Testing jsonrpc setListening...";
+	cnote << "Testing jsonrpc setListening...";
 
 	jsonrpcClient->setListening(true);
 	BOOST_CHECK_EQUAL(web3.isNetworkStarted(), true);
@@ -238,88 +238,88 @@ BOOST_AUTO_TEST_CASE(jsonrpc_setListening)
 
 BOOST_AUTO_TEST_CASE(jsonrpc_setMining)
 {
-    cnote << "Testing jsonrpc setMining...";
+	cnote << "Testing jsonrpc setMining...";
 
-    jsonrpcClient->setMining(true);
-    BOOST_CHECK_EQUAL(web3.ethereum()->isMining(), true);
+	jsonrpcClient->setMining(true);
+	BOOST_CHECK_EQUAL(web3.ethereum()->isMining(), true);
 
-    jsonrpcClient->setMining(false);
-    BOOST_CHECK_EQUAL(web3.ethereum()->isMining(), false);
+	jsonrpcClient->setMining(false);
+	BOOST_CHECK_EQUAL(web3.ethereum()->isMining(), false);
 }
 
 BOOST_AUTO_TEST_CASE(jsonrpc_sha3)
 {
-    cnote << "Testing jsonrpc sha3...";
-    string testString = "1234567890987654";
-    string sha3 = jsonrpcClient->sha3(testString);
-    BOOST_CHECK_EQUAL(jsToFixed<32>(sha3), dev::eth::sha3(jsToBytes(testString)));
+	cnote << "Testing jsonrpc sha3...";
+	string testString = "1234567890987654";
+	string sha3 = jsonrpcClient->sha3(testString);
+	BOOST_CHECK_EQUAL(jsToFixed<32>(sha3), dev::eth::sha3(jsToBytes(testString)));
 }
 
 BOOST_AUTO_TEST_CASE(jsonrpc_stateAt)
 {
-    cnote << "Testing jsonrpc stateAt...";
-    dev::KeyPair key = KeyPair::create();
-    auto address = key.address();
-    string stateAt = jsonrpcClient->stateAt(toJS(address), 0, "0");
-    BOOST_CHECK_EQUAL(toJS(web3.ethereum()->stateAt(address, jsToU256("0"), 0)), stateAt);
+	cnote << "Testing jsonrpc stateAt...";
+	dev::KeyPair key = KeyPair::create();
+	auto address = key.address();
+	string stateAt = jsonrpcClient->stateAt(toJS(address), 0, "0");
+	BOOST_CHECK_EQUAL(toJS(web3.ethereum()->stateAt(address, jsToU256("0"), 0)), stateAt);
 }
 
 BOOST_AUTO_TEST_CASE(jsonrpc_toAscii)
 {
-    cnote << "Testing jsonrpc toAscii...";
-    string testString = "1234567890987654";
-    string ascii = jsonrpcClient->toAscii(testString);
-    BOOST_CHECK_EQUAL(jsToBinary(testString), ascii);
+	cnote << "Testing jsonrpc toAscii...";
+	string testString = "1234567890987654";
+	string ascii = jsonrpcClient->toAscii(testString);
+	BOOST_CHECK_EQUAL(jsToBinary(testString), ascii);
 }
 
 BOOST_AUTO_TEST_CASE(jsonrpc_toDecimal)
 {
-    cnote << "Testing jsonrpc toDecimal...";
-    string testString = "1234567890987654";
-    string decimal = jsonrpcClient->toDecimal(testString);
-    BOOST_CHECK_EQUAL(jsToDecimal(testString), decimal);
+	cnote << "Testing jsonrpc toDecimal...";
+	string testString = "1234567890987654";
+	string decimal = jsonrpcClient->toDecimal(testString);
+	BOOST_CHECK_EQUAL(jsToDecimal(testString), decimal);
 }
 
 BOOST_AUTO_TEST_CASE(jsonrpc_toFixed)
 {
-    cnote << "Testing jsonrpc toFixed...";
-    double testValue = 123567;
-    string fixed = jsonrpcClient->toFixed(testValue);
-    BOOST_CHECK_EQUAL(jsToFixed(testValue), fixed);
-    BOOST_CHECK_EQUAL(testValue, jsFromFixed(fixed));
+	cnote << "Testing jsonrpc toFixed...";
+	double testValue = 123567;
+	string fixed = jsonrpcClient->toFixed(testValue);
+	BOOST_CHECK_EQUAL(jsToFixed(testValue), fixed);
+	BOOST_CHECK_EQUAL(testValue, jsFromFixed(fixed));
 }
 
 BOOST_AUTO_TEST_CASE(jsonrpc_transact)
 {
-    cnote << "Testing jsonrpc transact...";
-    dev::KeyPair key = KeyPair::create();
-    auto address = key.address();
-    auto receiver = KeyPair::create();
-    
-    web3.ethereum()->setAddress(address);
-    dev::eth::mine(*(web3.ethereum()), 1);
-    auto balance = web3.ethereum()->balanceAt(address, 0);
-    BOOST_REQUIRE(balance > 0);
-    auto txAmount = balance / 2u;
-    auto gasPrice = 10 * dev::eth::szabo;
-    auto gas = dev::eth::c_txGas;
-    
-    Json::Value t;
-    t["from"] = toJS(key.secret());
-    t["value"] = jsToDecimal(toJS(txAmount));
-    t["to"] = toJS(receiver.address());
-    t["data"] = toJS(bytes());
-    t["gas"] = toJS(gas);
-    t["gasPrice"] = toJS(gasPrice);
-    
-    jsonrpcClient->transact(t);
-    
-    dev::eth::mine(*(web3.ethereum()), 1);
-    auto balance2 = web3.ethereum()->balanceAt(receiver.address());
-    auto messages = jsonrpcClient->messages(Json::Value());
-    BOOST_REQUIRE(balance2 > 0);
-    BOOST_CHECK_EQUAL(txAmount, balance2);
-    BOOST_CHECK_EQUAL(txAmount, jsToU256(messages[0u]["value"].asString()));
+	cnote << "Testing jsonrpc transact...";
+	dev::KeyPair key = KeyPair::create();
+	auto address = key.address();
+	auto receiver = KeyPair::create();
+	
+	web3.ethereum()->setAddress(address);
+	dev::eth::mine(*(web3.ethereum()), 1);
+	auto balance = web3.ethereum()->balanceAt(address, 0);
+	BOOST_REQUIRE(balance > 0);
+	auto txAmount = balance / 2u;
+	auto gasPrice = 10 * dev::eth::szabo;
+	auto gas = dev::eth::c_txGas;
+	
+	Json::Value t;
+	t["from"] = toJS(key.secret());
+	t["value"] = jsToDecimal(toJS(txAmount));
+	t["to"] = toJS(receiver.address());
+	t["data"] = toJS(bytes());
+	t["gas"] = toJS(gas);
+	t["gasPrice"] = toJS(gasPrice);
+	
+	jsonrpcClient->transact(t);
+	
+	dev::eth::mine(*(web3.ethereum()), 1);
+	auto balance2 = web3.ethereum()->balanceAt(receiver.address());
+	auto messages = jsonrpcClient->messages(Json::Value());
+	BOOST_REQUIRE(balance2 > 0);
+	BOOST_CHECK_EQUAL(txAmount, balance2);
+	BOOST_CHECK_EQUAL(txAmount, jsToU256(messages[0u]["value"].asString()));
 }