fix gasPricer tests

Dimitry · Dimitry · commit 8f7e7ac18330 · 2019-07-11T14:53:45.000+03:00
diff --git a/test/unittests/libethereum/GasPricer.cpp b/test/unittests/libethereum/GasPricer.cpp
@@ -95,95 +95,95 @@ BOOST_AUTO_TEST_CASE(basicGasPricer_RPC_API_Test_Frontier)
 {
 	u256 _expectedAsk = 16056883295;
 	u256 _expectedBid = 1;
-	dev::test::executeGasPricerTest("RPC_API_Test_Frontier", 30.679, 15.0, "/BlockchainTests/bcGasPricerTest/RPC_API_Test.json", TransactionPriority::Medium, _expectedAsk, _expectedBid, eth::Network::FrontierTest);
+    dev::test::executeGasPricerTest("RPC_API_Test_Frontier", 30.679, 15.0, "/BlockchainTests/ValidBlocks/bcGasPricerTest/RPC_API_Test.json", TransactionPriority::Medium, _expectedAsk, _expectedBid, eth::Network::FrontierTest);
 }
 
 BOOST_AUTO_TEST_CASE(basicGasPricer_RPC_API_Test_Homestead)
 {
 	u256 _expectedAsk = 16056864311;
 	u256 _expectedBid = 1;
-	dev::test::executeGasPricerTest("RPC_API_Test_Homestead", 30.679, 15.0, "/BlockchainTests/bcGasPricerTest/RPC_API_Test.json", TransactionPriority::Medium, _expectedAsk, _expectedBid, eth::Network::HomesteadTest);
+    dev::test::executeGasPricerTest("RPC_API_Test_Homestead", 30.679, 15.0, "/BlockchainTests/ValidBlocks/bcGasPricerTest/RPC_API_Test.json", TransactionPriority::Medium, _expectedAsk, _expectedBid, eth::Network::HomesteadTest);
 }
 
 BOOST_AUTO_TEST_CASE(basicGasPricer_bcValidBlockTest)
 {
-	dev::test::executeGasPricerTest("SimpleTx_Frontier", 30.679, 15.0, "/BlockchainTests/bcValidBlockTest/SimpleTx.json", TransactionPriority::Medium, 155632494086, 10);
+    dev::test::executeGasPricerTest("SimpleTx_Frontier", 30.679, 15.0, "/BlockchainTests/ValidBlocks/bcValidBlockTest/SimpleTx.json", TransactionPriority::Medium, 155632494086, 10);
 }
 
 BOOST_AUTO_TEST_CASE(basicGasPricer_bcUncleTest_Frontier)
 {
 	u256 _expectedAsk = 155632494086;
 	u256 _expectedBid = 1;
-	dev::test::executeGasPricerTest("twoUncle_Frontier", 30.679, 15.0, "/BlockchainTests/bcUncleTest/twoUncle.json", TransactionPriority::Medium, _expectedAsk, _expectedBid, eth::Network::FrontierTest);
+    dev::test::executeGasPricerTest("twoUncle_Frontier", 30.679, 15.0, "/BlockchainTests/ValidBlocks/bcUncleTest/twoUncle.json", TransactionPriority::Medium, _expectedAsk, _expectedBid, eth::Network::FrontierTest);
 }
 
 BOOST_AUTO_TEST_CASE(basicGasPricer_bcUncleTest_Homestead)
 {
     u256 _expectedAsk = 155632494086;
     u256 _expectedBid = 1;
-	dev::test::executeGasPricerTest("twoUncle_Homestead", 30.679, 15.0, "/BlockchainTests/bcUncleTest/twoUncle.json", TransactionPriority::Medium, _expectedAsk, _expectedBid, eth::Network::HomesteadTest);
+    dev::test::executeGasPricerTest("twoUncle_Homestead", 30.679, 15.0, "/BlockchainTests/ValidBlocks/bcUncleTest/twoUncle.json", TransactionPriority::Medium, _expectedAsk, _expectedBid, eth::Network::HomesteadTest);
 }
 
 BOOST_AUTO_TEST_CASE(basicGasPricer_bcUncleHeaderValidity_Frontier)
 {
 	u256 _expectedAsk = 155632494086;
 	u256 _expectedBid = 1;
-	dev::test::executeGasPricerTest("correct_Frontier", 30.679, 15.0, "/BlockchainTests/bcUncleHeaderValidity/correct.json", TransactionPriority::Medium, _expectedAsk, _expectedBid, eth::Network::FrontierTest);
+    dev::test::executeGasPricerTest("correct_Frontier", 30.679, 15.0, "/BlockchainTests/InvalidBlocks/bcUncleHeaderValidity/correct.json", TransactionPriority::Medium, _expectedAsk, _expectedBid, eth::Network::FrontierTest);
 }
 
 BOOST_AUTO_TEST_CASE(basicGasPricer_bcUncleHeaderValidity_Homestead)
 {
 	u256 _expectedAsk = 155633980282;
 	u256 _expectedBid = 1;
-	dev::test::executeGasPricerTest("correct_Homestead", 30.679, 15.0, "/BlockchainTests/bcUncleHeaderValidity/correct.json", TransactionPriority::Medium, _expectedAsk, _expectedBid, eth::Network::HomesteadTest);
+    dev::test::executeGasPricerTest("correct_Homestead", 30.679, 15.0, "/BlockchainTests/InvalidBlocks/bcUncleHeaderValidity/correct.json", TransactionPriority::Medium, _expectedAsk, _expectedBid, eth::Network::HomesteadTest);
 }
 
 BOOST_AUTO_TEST_CASE(basicGasPricer_notxs_frontier)
 {
 	u256 _expectedAsk = 155632494086;
 	u256 _expectedBid = 155632494086;
-	dev::test::executeGasPricerTest("notxs_Frontier", 30.679, 15.0, "/BlockchainTests/bcGasPricerTest/notxs.json", TransactionPriority::Medium, _expectedAsk, _expectedBid, eth::Network::FrontierTest);
+    dev::test::executeGasPricerTest("notxs_Frontier", 30.679, 15.0, "/BlockchainTests/ValidBlocks/bcGasPricerTest/notxs.json", TransactionPriority::Medium, _expectedAsk, _expectedBid, eth::Network::FrontierTest);
 }
 
 BOOST_AUTO_TEST_CASE(basicGasPricer_notxs_homestead)
 {
     u256 _expectedAsk = 155632494086;
     u256 _expectedBid = 155632494086;
-    dev::test::executeGasPricerTest("notxs_Homestead", 30.679, 15.0, "/BlockchainTests/bcGasPricerTest/notxs.json", TransactionPriority::Medium, _expectedAsk, _expectedBid, eth::Network::HomesteadTest);
+    dev::test::executeGasPricerTest("notxs_Homestead", 30.679, 15.0, "/BlockchainTests/ValidBlocks/bcGasPricerTest/notxs.json", TransactionPriority::Medium, _expectedAsk, _expectedBid, eth::Network::HomesteadTest);
 }
 
 BOOST_AUTO_TEST_CASE(basicGasPricer_highGasUsage_LowestPrio)
 {
     u256 _expectedAsk = 15731408053;
     u256 _expectedBid = 10000000000000;
-	dev::test::executeGasPricerTest("highGasUsage_Frontier", 30.679, 15.0, "/BlockchainTests/bcGasPricerTest/highGasUsage.json", TransactionPriority::Lowest, _expectedAsk, _expectedBid, eth::Network::FrontierTest);
+    dev::test::executeGasPricerTest("highGasUsage_Frontier", 30.679, 15.0, "/BlockchainTests/ValidBlocks/bcGasPricerTest/highGasUsage.json", TransactionPriority::Lowest, _expectedAsk, _expectedBid, eth::Network::FrontierTest);
 }
 
 BOOST_AUTO_TEST_CASE(basicGasPricer_highGasUsage_LowPrio)
 {
     u256 _expectedAsk = 15731408053;
     u256 _expectedBid = 15734152261884;
-	dev::test::executeGasPricerTest("highGasUsage_Frontier", 30.679, 15.0, "/BlockchainTests/bcGasPricerTest/highGasUsage.json", TransactionPriority::Low, _expectedAsk, _expectedBid, eth::Network::FrontierTest);
+    dev::test::executeGasPricerTest("highGasUsage_Frontier", 30.679, 15.0, "/BlockchainTests/ValidBlocks/bcGasPricerTest/highGasUsage.json", TransactionPriority::Low, _expectedAsk, _expectedBid, eth::Network::FrontierTest);
 }
 
 BOOST_AUTO_TEST_CASE(basicGasPricer_highGasUsage_MediumPrio)
 {
     u256 _expectedAsk = 15731408053;
     u256 _expectedBid = 20000000000000;
-	dev::test::executeGasPricerTest("highGasUsage_Frontier", 30.679, 15.0, "/BlockchainTests/bcGasPricerTest/highGasUsage.json", TransactionPriority::Medium, _expectedAsk, _expectedBid, eth::Network::FrontierTest);
+    dev::test::executeGasPricerTest("highGasUsage_Frontier", 30.679, 15.0, "/BlockchainTests/ValidBlocks/bcGasPricerTest/highGasUsage.json", TransactionPriority::Medium, _expectedAsk, _expectedBid, eth::Network::FrontierTest);
 }
 
 BOOST_AUTO_TEST_CASE(basicGasPricer_highGasUsage_HighPrio)
 {
     u256 _expectedAsk = 15731408053;
     u256 _expectedBid = 24265847738115;
-	dev::test::executeGasPricerTest("highGasUsage_Frontier", 30.679, 15.0, "/BlockchainTests/bcGasPricerTest/highGasUsage.json", TransactionPriority::High, _expectedAsk, _expectedBid, eth::Network::FrontierTest);
+    dev::test::executeGasPricerTest("highGasUsage_Frontier", 30.679, 15.0, "/BlockchainTests/ValidBlocks/bcGasPricerTest/highGasUsage.json", TransactionPriority::High, _expectedAsk, _expectedBid, eth::Network::FrontierTest);
 }
 
 BOOST_AUTO_TEST_CASE(basicGasPricer_highGasUsage_HighestPrio)
 {
     u256 _expectedAsk = 15731408053;
     u256 _expectedBid = 30000000000000;
-	dev::test::executeGasPricerTest("highGasUsage_Frontier", 30.679, 15.0, "/BlockchainTests/bcGasPricerTest/highGasUsage.json", TransactionPriority::Highest, _expectedAsk, _expectedBid, eth::Network::FrontierTest);
+    dev::test::executeGasPricerTest("highGasUsage_Frontier", 30.679, 15.0, "/BlockchainTests/ValidBlocks/bcGasPricerTest/highGasUsage.json", TransactionPriority::Highest, _expectedAsk, _expectedBid, eth::Network::FrontierTest);
 }
 BOOST_AUTO_TEST_SUITE_END()

Original file line number	Diff line number	Diff line change
`@@ -95,95 +95,95 @@ BOOST_AUTO_TEST_CASE(basicGasPricer_RPC_API_Test_Frontier)`
`95`	`95`	`{`
`96`	`96`	`u256 _expectedAsk = 16056883295;`
`97`	`97`	`u256 _expectedBid = 1;`
`98`		`- dev::test::executeGasPricerTest("RPC_API_Test_Frontier", 30.679, 15.0, "/BlockchainTests/bcGasPricerTest/RPC_API_Test.json", TransactionPriority::Medium, _expectedAsk, _expectedBid, eth::Network::FrontierTest);`
	`98`	`+ dev::test::executeGasPricerTest("RPC_API_Test_Frontier", 30.679, 15.0, "/BlockchainTests/ValidBlocks/bcGasPricerTest/RPC_API_Test.json", TransactionPriority::Medium, _expectedAsk, _expectedBid, eth::Network::FrontierTest);`
`99`	`99`	`}`
`100`	`100`
`101`	`101`	`BOOST_AUTO_TEST_CASE(basicGasPricer_RPC_API_Test_Homestead)`
`102`	`102`	`{`
`103`	`103`	`u256 _expectedAsk = 16056864311;`
`104`	`104`	`u256 _expectedBid = 1;`
`105`		`- dev::test::executeGasPricerTest("RPC_API_Test_Homestead", 30.679, 15.0, "/BlockchainTests/bcGasPricerTest/RPC_API_Test.json", TransactionPriority::Medium, _expectedAsk, _expectedBid, eth::Network::HomesteadTest);`
	`105`	`+ dev::test::executeGasPricerTest("RPC_API_Test_Homestead", 30.679, 15.0, "/BlockchainTests/ValidBlocks/bcGasPricerTest/RPC_API_Test.json", TransactionPriority::Medium, _expectedAsk, _expectedBid, eth::Network::HomesteadTest);`
`106`	`106`	`}`
`107`	`107`
`108`	`108`	`BOOST_AUTO_TEST_CASE(basicGasPricer_bcValidBlockTest)`
`109`	`109`	`{`
`110`		`- dev::test::executeGasPricerTest("SimpleTx_Frontier", 30.679, 15.0, "/BlockchainTests/bcValidBlockTest/SimpleTx.json", TransactionPriority::Medium, 155632494086, 10);`
	`110`	`+ dev::test::executeGasPricerTest("SimpleTx_Frontier", 30.679, 15.0, "/BlockchainTests/ValidBlocks/bcValidBlockTest/SimpleTx.json", TransactionPriority::Medium, 155632494086, 10);`
`111`	`111`	`}`
`112`	`112`
`113`	`113`	`BOOST_AUTO_TEST_CASE(basicGasPricer_bcUncleTest_Frontier)`
`114`	`114`	`{`
`115`	`115`	`u256 _expectedAsk = 155632494086;`
`116`	`116`	`u256 _expectedBid = 1;`
`117`		`- dev::test::executeGasPricerTest("twoUncle_Frontier", 30.679, 15.0, "/BlockchainTests/bcUncleTest/twoUncle.json", TransactionPriority::Medium, _expectedAsk, _expectedBid, eth::Network::FrontierTest);`
	`117`	`+ dev::test::executeGasPricerTest("twoUncle_Frontier", 30.679, 15.0, "/BlockchainTests/ValidBlocks/bcUncleTest/twoUncle.json", TransactionPriority::Medium, _expectedAsk, _expectedBid, eth::Network::FrontierTest);`
`118`	`118`	`}`
`119`	`119`
`120`	`120`	`BOOST_AUTO_TEST_CASE(basicGasPricer_bcUncleTest_Homestead)`
`121`	`121`	`{`
`122`	`122`	`u256 _expectedAsk = 155632494086;`
`123`	`123`	`u256 _expectedBid = 1;`
`124`		`- dev::test::executeGasPricerTest("twoUncle_Homestead", 30.679, 15.0, "/BlockchainTests/bcUncleTest/twoUncle.json", TransactionPriority::Medium, _expectedAsk, _expectedBid, eth::Network::HomesteadTest);`
	`124`	`+ dev::test::executeGasPricerTest("twoUncle_Homestead", 30.679, 15.0, "/BlockchainTests/ValidBlocks/bcUncleTest/twoUncle.json", TransactionPriority::Medium, _expectedAsk, _expectedBid, eth::Network::HomesteadTest);`
`125`	`125`	`}`
`126`	`126`
`127`	`127`	`BOOST_AUTO_TEST_CASE(basicGasPricer_bcUncleHeaderValidity_Frontier)`
`128`	`128`	`{`
`129`	`129`	`u256 _expectedAsk = 155632494086;`
`130`	`130`	`u256 _expectedBid = 1;`
`131`		`- dev::test::executeGasPricerTest("correct_Frontier", 30.679, 15.0, "/BlockchainTests/bcUncleHeaderValidity/correct.json", TransactionPriority::Medium, _expectedAsk, _expectedBid, eth::Network::FrontierTest);`
	`131`	`+ dev::test::executeGasPricerTest("correct_Frontier", 30.679, 15.0, "/BlockchainTests/InvalidBlocks/bcUncleHeaderValidity/correct.json", TransactionPriority::Medium, _expectedAsk, _expectedBid, eth::Network::FrontierTest);`
`132`	`132`	`}`
`133`	`133`
`134`	`134`	`BOOST_AUTO_TEST_CASE(basicGasPricer_bcUncleHeaderValidity_Homestead)`
`135`	`135`	`{`
`136`	`136`	`u256 _expectedAsk = 155633980282;`
`137`	`137`	`u256 _expectedBid = 1;`
`138`		`- dev::test::executeGasPricerTest("correct_Homestead", 30.679, 15.0, "/BlockchainTests/bcUncleHeaderValidity/correct.json", TransactionPriority::Medium, _expectedAsk, _expectedBid, eth::Network::HomesteadTest);`
	`138`	`+ dev::test::executeGasPricerTest("correct_Homestead", 30.679, 15.0, "/BlockchainTests/InvalidBlocks/bcUncleHeaderValidity/correct.json", TransactionPriority::Medium, _expectedAsk, _expectedBid, eth::Network::HomesteadTest);`
`139`	`139`	`}`
`140`	`140`
`141`	`141`	`BOOST_AUTO_TEST_CASE(basicGasPricer_notxs_frontier)`
`142`	`142`	`{`
`143`	`143`	`u256 _expectedAsk = 155632494086;`
`144`	`144`	`u256 _expectedBid = 155632494086;`
`145`		`- dev::test::executeGasPricerTest("notxs_Frontier", 30.679, 15.0, "/BlockchainTests/bcGasPricerTest/notxs.json", TransactionPriority::Medium, _expectedAsk, _expectedBid, eth::Network::FrontierTest);`
	`145`	`+ dev::test::executeGasPricerTest("notxs_Frontier", 30.679, 15.0, "/BlockchainTests/ValidBlocks/bcGasPricerTest/notxs.json", TransactionPriority::Medium, _expectedAsk, _expectedBid, eth::Network::FrontierTest);`
`146`	`146`	`}`
`147`	`147`
`148`	`148`	`BOOST_AUTO_TEST_CASE(basicGasPricer_notxs_homestead)`
`149`	`149`	`{`
`150`	`150`	`u256 _expectedAsk = 155632494086;`
`151`	`151`	`u256 _expectedBid = 155632494086;`
`152`		`- dev::test::executeGasPricerTest("notxs_Homestead", 30.679, 15.0, "/BlockchainTests/bcGasPricerTest/notxs.json", TransactionPriority::Medium, _expectedAsk, _expectedBid, eth::Network::HomesteadTest);`
	`152`	`+ dev::test::executeGasPricerTest("notxs_Homestead", 30.679, 15.0, "/BlockchainTests/ValidBlocks/bcGasPricerTest/notxs.json", TransactionPriority::Medium, _expectedAsk, _expectedBid, eth::Network::HomesteadTest);`
`153`	`153`	`}`
`154`	`154`
`155`	`155`	`BOOST_AUTO_TEST_CASE(basicGasPricer_highGasUsage_LowestPrio)`
`156`	`156`	`{`
`157`	`157`	`u256 _expectedAsk = 15731408053;`
`158`	`158`	`u256 _expectedBid = 10000000000000;`
`159`		`- dev::test::executeGasPricerTest("highGasUsage_Frontier", 30.679, 15.0, "/BlockchainTests/bcGasPricerTest/highGasUsage.json", TransactionPriority::Lowest, _expectedAsk, _expectedBid, eth::Network::FrontierTest);`
	`159`	`+ dev::test::executeGasPricerTest("highGasUsage_Frontier", 30.679, 15.0, "/BlockchainTests/ValidBlocks/bcGasPricerTest/highGasUsage.json", TransactionPriority::Lowest, _expectedAsk, _expectedBid, eth::Network::FrontierTest);`
`160`	`160`	`}`
`161`	`161`
`162`	`162`	`BOOST_AUTO_TEST_CASE(basicGasPricer_highGasUsage_LowPrio)`
`163`	`163`	`{`
`164`	`164`	`u256 _expectedAsk = 15731408053;`
`165`	`165`	`u256 _expectedBid = 15734152261884;`
`166`		`- dev::test::executeGasPricerTest("highGasUsage_Frontier", 30.679, 15.0, "/BlockchainTests/bcGasPricerTest/highGasUsage.json", TransactionPriority::Low, _expectedAsk, _expectedBid, eth::Network::FrontierTest);`
	`166`	`+ dev::test::executeGasPricerTest("highGasUsage_Frontier", 30.679, 15.0, "/BlockchainTests/ValidBlocks/bcGasPricerTest/highGasUsage.json", TransactionPriority::Low, _expectedAsk, _expectedBid, eth::Network::FrontierTest);`
`167`	`167`	`}`
`168`	`168`
`169`	`169`	`BOOST_AUTO_TEST_CASE(basicGasPricer_highGasUsage_MediumPrio)`
`170`	`170`	`{`
`171`	`171`	`u256 _expectedAsk = 15731408053;`
`172`	`172`	`u256 _expectedBid = 20000000000000;`
`173`		`- dev::test::executeGasPricerTest("highGasUsage_Frontier", 30.679, 15.0, "/BlockchainTests/bcGasPricerTest/highGasUsage.json", TransactionPriority::Medium, _expectedAsk, _expectedBid, eth::Network::FrontierTest);`
	`173`	`+ dev::test::executeGasPricerTest("highGasUsage_Frontier", 30.679, 15.0, "/BlockchainTests/ValidBlocks/bcGasPricerTest/highGasUsage.json", TransactionPriority::Medium, _expectedAsk, _expectedBid, eth::Network::FrontierTest);`
`174`	`174`	`}`
`175`	`175`
`176`	`176`	`BOOST_AUTO_TEST_CASE(basicGasPricer_highGasUsage_HighPrio)`
`177`	`177`	`{`
`178`	`178`	`u256 _expectedAsk = 15731408053;`
`179`	`179`	`u256 _expectedBid = 24265847738115;`
`180`		`- dev::test::executeGasPricerTest("highGasUsage_Frontier", 30.679, 15.0, "/BlockchainTests/bcGasPricerTest/highGasUsage.json", TransactionPriority::High, _expectedAsk, _expectedBid, eth::Network::FrontierTest);`
	`180`	`+ dev::test::executeGasPricerTest("highGasUsage_Frontier", 30.679, 15.0, "/BlockchainTests/ValidBlocks/bcGasPricerTest/highGasUsage.json", TransactionPriority::High, _expectedAsk, _expectedBid, eth::Network::FrontierTest);`
`181`	`181`	`}`
`182`	`182`
`183`	`183`	`BOOST_AUTO_TEST_CASE(basicGasPricer_highGasUsage_HighestPrio)`
`184`	`184`	`{`
`185`	`185`	`u256 _expectedAsk = 15731408053;`
`186`	`186`	`u256 _expectedBid = 30000000000000;`
`187`		`- dev::test::executeGasPricerTest("highGasUsage_Frontier", 30.679, 15.0, "/BlockchainTests/bcGasPricerTest/highGasUsage.json", TransactionPriority::Highest, _expectedAsk, _expectedBid, eth::Network::FrontierTest);`
	`187`	`+ dev::test::executeGasPricerTest("highGasUsage_Frontier", 30.679, 15.0, "/BlockchainTests/ValidBlocks/bcGasPricerTest/highGasUsage.json", TransactionPriority::Highest, _expectedAsk, _expectedBid, eth::Network::FrontierTest);`
`188`	`188`	`}`
`189`	`189`	`BOOST_AUTO_TEST_SUITE_END()`