Fix solidity tests.

libjsqrc/ethereumjs/dist/web3-light.js

@@ -1664,7 +1664,7 @@ var getBlock = new Method({
     name: 'getBlock', 
     call: blockCall,
     params: 2,
-    inputFormatter: [utils.toHex, function (val) { return !!val; }],
+	inputFormatter: [formatters.inputBlockNumberFormatter, function (val) { return !!val; }],
     outputFormatter: formatters.outputBlockFormatter
 });
 
@@ -1672,7 +1672,7 @@ var getUncle = new Method({
     name: 'getUncle',
     call: uncleCall,
     params: 3,
-    inputFormatter: [utils.toHex, utils.toHex, function (val) { return !!val; }],
+	inputFormatter: [formatters.inputBlockNumberFormatter, utils.toHex, function (val) { return !!val; }],
     outputFormatter: formatters.outputBlockFormatter,
 
 });

libjsqrc/ethereumjs/lib/web3/eth.js

@@ -102,7 +102,7 @@ var getBlock = new Method({
     name: 'getBlock', 
     call: blockCall,
     params: 2,
-    inputFormatter: [utils.toHex, function (val) { return !!val; }],
+	inputFormatter: [formatters.inputBlockNumberFormatter, function (val) { return !!val; }],
     outputFormatter: formatters.outputBlockFormatter
 });
 
@@ -110,7 +110,7 @@ var getUncle = new Method({
     name: 'getUncle',
     call: uncleCall,
     params: 3,
-    inputFormatter: [utils.toHex, utils.toHex, function (val) { return !!val; }],
+	inputFormatter: [formatters.inputBlockNumberFormatter, utils.toHex, function (val) { return !!val; }],
     outputFormatter: formatters.outputBlockFormatter,
 
 });

test/SolidityEndToEndTest.cpp

@@ -1522,8 +1522,6 @@ BOOST_AUTO_TEST_CASE(ecrecover)
 	BOOST_CHECK(callContractFunction("a(bytes32,uint8,bytes32,bytes32)", h, v, r, s) == encodeArgs(addr));
 }
 
-#endif
-
 BOOST_AUTO_TEST_CASE(inter_contract_calls)
 {
 	char const* sourceCode = R"(
@@ -3683,3 +3681,5 @@ BOOST_AUTO_TEST_SUITE_END()
 }
 }
 } // end namespaces
+
+#endif