Merge pull request #177 from winsvega/testclient

testclient: setChainParams

Author: winsvega

eth/main.cpp

@@ -1197,25 +1197,29 @@ int main(int argc, char** argv)
 
 	AddressHash allowedDestinations;
 
-	auto authenticator = [&](TransactionSkeleton const& _t, bool isProxy) -> bool {
-		// "unlockAccount" functionality is done in the AccountHolder.
-		if (!alwaysConfirm || allowedDestinations.count(_t.to))
-			return true;
+	std::function<bool(TransactionSkeleton const&, bool)> authenticator;
+	if (testingMode)
+		authenticator = [](TransactionSkeleton const&, bool) -> bool { return true; };
+	else
+		authenticator = [&](TransactionSkeleton const& _t, bool isProxy) -> bool {
+			// "unlockAccount" functionality is done in the AccountHolder.
+			if (!alwaysConfirm || allowedDestinations.count(_t.to))
+				return true;
 
-		string r = getResponse(_t.userReadable(isProxy,
-			[&](TransactionSkeleton const& _t) -> pair<bool, string>
-			{
-				h256 contractCodeHash = web3.ethereum()->postState().codeHash(_t.to);
-				if (contractCodeHash == EmptySHA3)
-					return std::make_pair(false, std::string());
-				// TODO: actually figure out the natspec. we'll need the natspec database here though.
-				return std::make_pair(true, std::string());
-			}, [&](Address const& _a) { return ICAP(_a).encoded() + " (" + _a.abridged() + ")"; }
-		) + "\nEnter yes/no/always (always to this address): ", {"yes", "n", "N", "no", "NO", "always"});
-		if (r == "always")
-			allowedDestinations.insert(_t.to);
-		return r == "yes" || r == "always";
-	};
+			string r = getResponse(_t.userReadable(isProxy,
+				[&](TransactionSkeleton const& _t) -> pair<bool, string>
+				{
+					h256 contractCodeHash = web3.ethereum()->postState().codeHash(_t.to);
+					if (contractCodeHash == EmptySHA3)
+						return std::make_pair(false, std::string());
+					// TODO: actually figure out the natspec. we'll need the natspec database here though.
+					return std::make_pair(true, std::string());
+				}, [&](Address const& _a) { return ICAP(_a).encoded() + " (" + _a.abridged() + ")"; }
+			) + "\nEnter yes/no/always (always to this address): ", {"yes", "n", "N", "no", "NO", "always"});
+			if (r == "always")
+				allowedDestinations.insert(_t.to);
+			return r == "yes" || r == "always";
+		};
 
 	ExitHandler exitHandler;
 

libweb3jsonrpc/Test.cpp

@@ -24,6 +24,7 @@
 #include <jsonrpccpp/common/errors.h>
 #include <jsonrpccpp/common/exception.h>
 #include <libethereum/ClientTest.h>
+#include <libethereum/ChainParams.h>
 
 using namespace std;
 using namespace dev;
@@ -32,6 +33,22 @@ using namespace jsonrpc;
 
 Test::Test(eth::Client& _eth): m_eth(_eth) {}
 
+bool Test::test_setChainParams(Json::Value const& param1)
+{
+	try
+	{
+		Json::FastWriter fastWriter;
+		std::string output = fastWriter.write(param1);
+		asClientTest(m_eth).setChainParams(output);
+	}
+	catch (std::exception const&)
+	{
+		BOOST_THROW_EXCEPTION(JsonRpcException(Errors::ERROR_RPC_INTERNAL_ERROR));
+	}
+
+	return true;
+}
+
 bool Test::test_mineBlocks(int _number)
 {
 	try

libweb3jsonrpc/Test.h

@@ -43,6 +43,7 @@ class Test: public TestFace
 		return RPCModules{RPCModule{"test", "1.0"}};
 	}
 
+	virtual bool test_setChainParams(const Json::Value &param1) override;
 	virtual bool test_mineBlocks(int _number) override;
 	virtual bool test_modifyTimestamp(int _timestamp) override;
 	virtual bool test_addBlock(std::string const& _rlp) override;

libweb3jsonrpc/TestFace.h

@@ -14,12 +14,17 @@ namespace dev {
             public:
                 TestFace()
                 {
+                    this->bindAndAddMethod(jsonrpc::Procedure("test_setChainParams", jsonrpc::PARAMS_BY_POSITION, jsonrpc::JSON_BOOLEAN, "param1",jsonrpc::JSON_OBJECT, NULL), &dev::rpc::TestFace::test_setChainParamsI);
                     this->bindAndAddMethod(jsonrpc::Procedure("test_mineBlocks", jsonrpc::PARAMS_BY_POSITION, jsonrpc::JSON_BOOLEAN, "param1",jsonrpc::JSON_INTEGER, NULL), &dev::rpc::TestFace::test_mineBlocksI);
                     this->bindAndAddMethod(jsonrpc::Procedure("test_modifyTimestamp", jsonrpc::PARAMS_BY_POSITION, jsonrpc::JSON_BOOLEAN, "param1",jsonrpc::JSON_INTEGER, NULL), &dev::rpc::TestFace::test_modifyTimestampI);
                     this->bindAndAddMethod(jsonrpc::Procedure("test_addBlock", jsonrpc::PARAMS_BY_POSITION, jsonrpc::JSON_BOOLEAN, "param1",jsonrpc::JSON_STRING, NULL), &dev::rpc::TestFace::test_addBlockI);
                     this->bindAndAddMethod(jsonrpc::Procedure("test_rewindToBlock", jsonrpc::PARAMS_BY_POSITION, jsonrpc::JSON_BOOLEAN, "param1",jsonrpc::JSON_INTEGER, NULL), &dev::rpc::TestFace::test_rewindToBlockI);
                 }
 
+                inline virtual void test_setChainParamsI(const Json::Value &request, Json::Value &response)
+                {
+                    response = this->test_setChainParams(request[0u]);
+                }
                 inline virtual void test_mineBlocksI(const Json::Value &request, Json::Value &response)
                 {
                     response = this->test_mineBlocks(request[0u].asInt());
@@ -36,6 +41,7 @@ namespace dev {
                 {
                     response = this->test_rewindToBlock(request[0u].asInt());
                 }
+                virtual bool test_setChainParams(const Json::Value& param1) = 0;
                 virtual bool test_mineBlocks(int param1) = 0;
                 virtual bool test_modifyTimestamp(int param1) = 0;
                 virtual bool test_addBlock(const std::string& param1) = 0;

libweb3jsonrpc/test.json

@@ -1,4 +1,5 @@
 [
+{ "name": "test_setChainParams", "params": [{}], "order": [], "returns": false},
 { "name": "test_mineBlocks", "params": [0], "returns": false },
 { "name": "test_modifyTimestamp", "params": [0], "returns": false },
 { "name": "test_addBlock", "params": [""], "returns": false },