From 4250af041de66af5ff5e314f39288c6615e71f25 Mon Sep 17 00:00:00 2001
From: CJentzsch <jentzsch.software@gmail.com>
Date: Wed, 14 Jan 2015 22:35:33 +0100
Subject: [PATCH] included vmInpulLimit Tests, updated vmSystemOperationTests

---
 vm.cpp                            | 17 +++++++++------
 vmSystemOperationsTestFiller.json | 36 +++++++++++++++----------------
 2 files changed, 29 insertions(+), 24 deletions(-)

diff --git a/vm.cpp b/vm.cpp
index 7afd9de13..f15dc048a 100644
--- a/vm.cpp
+++ b/vm.cpp
@@ -508,23 +508,28 @@ BOOST_AUTO_TEST_CASE(vmLogTest)
 	dev::test::executeTests("vmLogTest", "/VMTests", dev::test::doVMTests);
 }
 
-BOOST_AUTO_TEST_CASE(vmPerformanceTest)
+BOOST_AUTO_TEST_CASE(vmSystemOperationsTest)
+{
+	dev::test::executeTests("vmSystemOperationsTest", "/VMTests", dev::test::doVMTests);
+}
+
+BOOST_AUTO_TEST_CASE(vmInputLimitsTest1)
 {
 	for (int i = 1; i < boost::unit_test::framework::master_test_suite().argc; ++i)
 	{
 		string arg = boost::unit_test::framework::master_test_suite().argv[i];
-		if (arg == "--performance")
-			dev::test::executeTests("vmPerformanceTest", "/VMTests", dev::test::doVMTests);
+		if (arg == "--inputlimits")
+			dev::test::executeTests("vmInputLimitsTest1", "/VMTests", dev::test::doVMTests);
 	}
 }
 
-BOOST_AUTO_TEST_CASE(vmArithPerformanceTest)
+BOOST_AUTO_TEST_CASE(vmInputLimitsTest2)
 {
 	for (int i = 1; i < boost::unit_test::framework::master_test_suite().argc; ++i)
 	{
 		string arg = boost::unit_test::framework::master_test_suite().argv[i];
-		if (arg == "--performance")
-			dev::test::executeTests("vmArithPerformanceTest", "/VMTests", dev::test::doVMTests);
+		if (arg == "--inputlimits")
+			dev::test::executeTests("vmInputLimitsTest2", "/VMTests", dev::test::doVMTests);
 	}
 }
 
diff --git a/vmSystemOperationsTestFiller.json b/vmSystemOperationsTestFiller.json
index a5cd79030..0e160bd53 100644
--- a/vmSystemOperationsTestFiller.json
+++ b/vmSystemOperationsTestFiller.json
@@ -12,7 +12,7 @@
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "1000000000000000000",
                 "nonce" : 0,
-                "code" : "{ (MSTORE 0 0x601080600c6000396000f200600035560f6009590060203560003557) [[ 0 ]] (CREATE 23 4 28) }",
+                "code" : "{ (MSTORE 0 0x601080600c6000396000f3006000355415600957005b60203560003555) [[ 0 ]] (CREATE 23 3 29) }",
                 "storage": {}
             }
         },
@@ -40,7 +40,7 @@
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "100",
                 "nonce" : 0,
-                "code" : "{ (MSTORE 0 0x601080600c6000396000f200600035560f6009590060203560003557) [[ 0 ]] (CREATE 230 4 28) }",
+                "code" : "{ (MSTORE 0 0x601080600c6000396000f3006000355415600957005b60203560003555) [[ 0 ]] (CREATE 230 3 29) }",
                 "storage": {}
             }
         },
@@ -68,7 +68,7 @@
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "100",
                 "nonce" : 0,
-                "code" : "{ (MSTORE 0 0x601080600c6000396000f200600035560f6009590060203560003557) [[ 0 ]] (CREATE 23 0xfffffffffff 28) }",
+                "code" : "{ (MSTORE 0 0x601080600c6000396000f3006000355415600957005b60203560003555) [[ 0 ]] (CREATE 23 0xfffffffffff 29) }",
                 "storage": {}
             }
         },
@@ -96,7 +96,7 @@
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "100",
                 "nonce" : 0,
-                "code" : "{ (MSTORE 0 0x601080600c6000396000f200600035560f6009590060203560003557) [[ 0 ]] (CREATE 23 4 0xffffffff) }",
+                "code" : "{ (MSTORE 0 0x601080600c6000396000f3006000355415600957005b60203560003555) [[ 0 ]] (CREATE 23 3 0xffffffff) }",
                 "storage": {}
             }
         },
@@ -129,7 +129,7 @@
             },
             "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "23",
-                "code" : "0x600035560f600a59005d60203560003557",
+                "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -340,7 +340,7 @@
             },
             "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "23",
-                "code" : "0x600035560f600a59005d60203560003557",
+                "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -376,7 +376,7 @@
             },
             "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "23",
-                "code" : "0x600035560f600a59005d60203560003557",
+                "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -412,7 +412,7 @@
             },
             "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "23",
-                "code" : "0x600035560f600a59005d60203560003557",
+                "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -448,7 +448,7 @@
             },
             "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "23",
-                "code" : "0x600035560f600a59005d60203560003557",
+                "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -485,7 +485,7 @@
             },
             "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "23",
-                "code" : "0x600035560f600a59005d60203560003557",
+                "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -521,7 +521,7 @@
             },
             "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "23",
-                "code" : "0x600035560f600a59005d60203560003557",
+                "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -675,7 +675,7 @@
             },
             "cd1722f3947def4cf144679da39c4c32bdc35681" : {
                 "balance" : "23",
-                "code" : "0x600035560f600a59005d60203560003557",
+                "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -711,7 +711,7 @@
             },
             "cd1722f3947def4cf144679da39c4c32bdc35681" : {
                 "balance" : "23",
-                "code" : "0x600035560f600a59005d60203560003557",
+                "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -747,7 +747,7 @@
             },
             "cd1722f3947def4cf144679da39c4c32bdc35681" : {
                 "balance" : "23",
-                "code" : "0x600035560f600a59005d60203560003557",
+                "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -873,7 +873,7 @@
             },
             "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "23",
-                "code" : "0x600035560f600a59005d60203560003557",
+                "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -909,7 +909,7 @@
             },
             "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "23",
-                "code" : "0x600035560f600a59005d60203560003557",
+                "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -945,7 +945,7 @@
             },
             "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "23",
-                "code" : "0x600035560f600a59005d60203560003557",
+                "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -976,7 +976,7 @@
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "1000000000000000000",
                 "nonce" : 0,
-                "code" : "0x600035560f600a59005d60203560003557",
+                "code" : "0x6000355415600957005b60203560003555",
                 "storage": {}
             }
         },