remove old transaction tests

56 files changed, 0 insertions, 1010 deletions

diff --git a/src/TransactionTestsFiller/ttVRuleEip158/AddressLessThan20Filler.json b/src/TransactionTestsFiller/ttVRuleEip158/AddressLessThan20Filler.json
deleted file mode 100644
index 1214f1925..000000000
--- a/src/TransactionTestsFiller/ttVRuleEip158/AddressLessThan20Filler.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "AddressLessThan20" : {
-	"expect" : "invalid",
-	"blocknumber" : "2675000",
-        "transaction" :
-        {
-            "data" : "",
-            "gasLimit" : "21000",
-            "gasPrice" : "1",
-            "nonce" : "0",
-            "to" : "0b9331677e6ebf",
-            "value" : "10",
-            "v" : "38",
-            "r" : "0x98ff921201554726367d2be8c804a7ff89ccf285ebc57dff8ae4c44b9c19ac4a",
-            "s" : "0x1887321be575c8095f789dd4c743dfe42c1820f9231f98a962b210e3ac2452a3"
-        }
-    }
-}
diff --git a/src/TransactionTestsFiller/ttVRuleEip158/AddressLessThan20Prefixed0Filler.json b/src/TransactionTestsFiller/ttVRuleEip158/AddressLessThan20Prefixed0Filler.json
deleted file mode 100644
index c00cde2da..000000000
--- a/src/TransactionTestsFiller/ttVRuleEip158/AddressLessThan20Prefixed0Filler.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "AddressLessThan20Prefixed0" : {
-	"expect" : "valid",
-	"blocknumber" : "2675000",
-        "transaction" :
-        {
-            "data" : "",
-            "gasLimit" : "21000",
-            "gasPrice" : "1",
-            "nonce" : "0",
-            "to" : "0x000000000000000000000000000b9331677e6ebf",
-            "value" : "10",
-            "v" : "38",
-            "r" : "0x98ff921201554726367d2be8c804a7ff89ccf285ebc57dff8ae4c44b9c19ac4a",
-            "s" : "0x2887321be575c8095f789dd4c743dfe42c1820f9231f98a962b210e3ac2452a3"
-        }
-    }
-}
diff --git a/src/TransactionTestsFiller/ttVRuleEip158/AddressMoreThan20Filler.json b/src/TransactionTestsFiller/ttVRuleEip158/AddressMoreThan20Filler.json
deleted file mode 100644
index 333cc353d..000000000
--- a/src/TransactionTestsFiller/ttVRuleEip158/AddressMoreThan20Filler.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "AddressMoreThan20" : {
-	"expect" : "invalid",
-	"blocknumber" : "2675000",
-        "transaction" :
-        {
-            "data" : "",
-            "gasLimit" : "21000",
-            "gasPrice" : "1",
-            "nonce" : "0",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b1c",
-            "value" : "10",
-            "v" : "38",
-            "r" : "0x98ff921201554726367d2be8c804a7ff89ccf285ebc57dff8ae4c44b9c19ac4a",
-            "s" : "0x1887321be575c8095f789dd4c743dfe42c1820f9231f98a962b210e3ac2452a3"
-        }
-    }
-}
diff --git a/src/TransactionTestsFiller/ttVRuleEip158/AddressMoreThan20PrefixedBy0Filler.json b/src/TransactionTestsFiller/ttVRuleEip158/AddressMoreThan20PrefixedBy0Filler.json
deleted file mode 100644
index ad958c96e..000000000
--- a/src/TransactionTestsFiller/ttVRuleEip158/AddressMoreThan20PrefixedBy0Filler.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "AddressMoreThan20PrefixedBy0" : {
-	"expect" : "invalid",
-	"blocknumber" : "2675000",
-        "transaction" :
-        {
-            "data" : "0x12",
-            "gasLimit" : "21000",
-            "gasPrice" : "123",
-            "nonce" : "54",
-            "to" : "0x0000000000000000095e7baea6a6c7c4c2dfeb977efac326af552d87",
-            "value" : "11",
-            "v" : "37",
-            "r" : "0x48b55bfa915ac795c431978d8a6a992b628d557da5ff759b307d495a36649353",
-            "s" : "0x1887321be575c8095f789dd4c743dfe42c1820f9231f98a962b210e3ac2452a3"
-        }
-    }
-}
diff --git a/src/TransactionTestsFiller/ttVRuleEip158/DataTestEnoughGASFiller.json b/src/TransactionTestsFiller/ttVRuleEip158/DataTestEnoughGASFiller.json
deleted file mode 100644
index 3997e8884..000000000
--- a/src/TransactionTestsFiller/ttVRuleEip158/DataTestEnoughGASFiller.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-    "DataTestEnoughGAS" : {
-	"expect" : "valid",
-	"blocknumber" : "2675000",
-        "transaction" :
-        {
-            "data" : "0x0358ac39584bc98a7c979f984b03",
-            "gasLimit" : "23000",
-            "gasPrice" : "1",
-            "nonce" : "0",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
-            "value" : "10",
-            "v" : "37",
-            "r" : "0x48b55bfa915ac795c431978d8a6a992b628d557da5ff759b307d495a36649353",
-            "s" : "secretkey 45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "s" : "0x1fffd310ac743f371de3b9f7f9cb56c0b28ad43601b4ab949f53faa07bd2c804"
-        }
-    }
-}
diff --git a/src/TransactionTestsFiller/ttVRuleEip158/DataTestFirstZeroBytesFiller.json b/src/TransactionTestsFiller/ttVRuleEip158/DataTestFirstZeroBytesFiller.json
deleted file mode 100644
index f79e77cfb..000000000
--- a/src/TransactionTestsFiller/ttVRuleEip158/DataTestFirstZeroBytesFiller.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-    "DataTestFirstZeroBytes" : {
-	"expect" : "valid",
-	"blocknumber" : "2675000",
-        "transaction" :
-        {
-            "data" : "0x0000000000000000000000000001000000000000000000000000000000",
-            "gasLimit" : "25000",
-            "gasPrice" : "1",
-            "nonce" : "0",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
-            "value" : "10",
-            "v" : "38",
-            "r" : "0x48b55bfa915ac795c431978d8a6a992b628d557da5ff759b307d495a36649353",
-            "s" : "secretkey 45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "s" : "0x1fffd310ac743f371de3b9f7f9cb56c0b28ad43601b4ab949f53faa07bd2c804"
-        }
-    }
-}
diff --git a/src/TransactionTestsFiller/ttVRuleEip158/DataTestLastZeroBytesFiller.json b/src/TransactionTestsFiller/ttVRuleEip158/DataTestLastZeroBytesFiller.json
deleted file mode 100644
index c3c7a8f0d..000000000
--- a/src/TransactionTestsFiller/ttVRuleEip158/DataTestLastZeroBytesFiller.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-    "DataTestLastZeroBytes" : {
-	"expect" : "valid",
-	"blocknumber" : "2675000",
-        "transaction" :
-        {
-            "data" : "0x0100000000000000000000000000000000000000000000000000000000",
-            "gasLimit" : "25000",
-            "gasPrice" : "1",
-            "nonce" : "0",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
-            "value" : "10",
-            "v" : "37",
-            "r" : "0x48b55bfa915ac795c431978d8a6a992b628d557da5ff759b307d495a36649353",
-            "s" : "secretkey 45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "s" : "0x1fffd310ac743f371de3b9f7f9cb56c0b28ad43601b4ab949f53faa07bd2c804"
-        }
-    }
-}
diff --git a/src/TransactionTestsFiller/ttVRuleEip158/DataTestNotEnoughGASFiller.json b/src/TransactionTestsFiller/ttVRuleEip158/DataTestNotEnoughGASFiller.json
deleted file mode 100644
index 5d6741fc7..000000000
--- a/src/TransactionTestsFiller/ttVRuleEip158/DataTestNotEnoughGASFiller.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "DataTestNotEnoughGAS" : {
-	"expect" : "invalid",
-	"blocknumber" : "2675000",
-        "transaction" :
-        {
-            "data" : "0x0358ac39584bc98a7c979f984b03",
-            "gasLimit" : "21020",
-            "gasPrice" : "1",
-            "nonce" : "0",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
-            "value" : "10",
-            "v" : "38",
-            "r" : "0x48b55bfa915ac795c431978d8a6a992b628d557da5ff759b307d495a36649353",
-            "s" : "0x1887321be575c8095f789dd4c743dfe42c1820f9231f98a962b210e3ac2452a3"
-        }
-    }
-}
diff --git a/src/TransactionTestsFiller/ttVRuleEip158/DataTestZeroBytesFiller.json b/src/TransactionTestsFiller/ttVRuleEip158/DataTestZeroBytesFiller.json
deleted file mode 100644
index f6ce56bec..000000000
--- a/src/TransactionTestsFiller/ttVRuleEip158/DataTestZeroBytesFiller.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-    "DataTestZeroBytes" : {
-	"expect" : "valid",
-	"blocknumber" : "2675000",
-        "transaction" :
-        {
-            "data" : "0x0000000000000000000000000000000000000000000000000000000000",
-            "gasLimit" : "25000",
-            "gasPrice" : "1",
-            "nonce" : "0",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
-            "value" : "10",
-            "v" : "38",
-            "r" : "0x48b55bfa915ac795c431978d8a6a992b628d557da5ff759b307d495a36649353",
-            "s" : "secretkey 45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "s" : "0x1fffd310ac743f371de3b9f7f9cb56c0b28ad43601b4ab949f53faa07bd2c804"
-        }
-    }
-}
diff --git a/src/TransactionTestsFiller/ttVRuleEip158/EmptyTransactionFiller.json b/src/TransactionTestsFiller/ttVRuleEip158/EmptyTransactionFiller.json
deleted file mode 100644
index be54faaad..000000000
--- a/src/TransactionTestsFiller/ttVRuleEip158/EmptyTransactionFiller.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "EmptyTransaction" : {
-	"expect" : "invalid",
-	"blocknumber" : "2675000",
-        "transaction" :
-        {
-            "data" : "",
-            "gasLimit" : "0",
-            "gasPrice" : "0",
-            "nonce" : "0",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
-            "value" : "0",
-            "v" : "37",
-            "r" : "0x48b55bfa915ac795c431978d8a6a992b628d557da5ff759b307d495a36649353",
-            "s" : "0x1887321be575c8095f789dd4c743dfe42c1820f9231f98a962b210e3ac2452a3"
-        }
-    }
-}
diff --git a/src/TransactionTestsFiller/ttVRuleEip158/NotEnoughGasLimitFiller.json b/src/TransactionTestsFiller/ttVRuleEip158/NotEnoughGasLimitFiller.json
deleted file mode 100644
index 38744d4ec..000000000
--- a/src/TransactionTestsFiller/ttVRuleEip158/NotEnoughGasLimitFiller.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "NotEnoughGasLimit" : {
-	"expect" : "invalid",
-	"blocknumber" : "2675000",
-        "transaction" :
-        {
-            "data" : "0x",
-            "gasLimit" : "20000",
-            "gasPrice" : "1",
-            "nonce" : "3",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-            "value" : "10",
-            "v" : "38",
-            "r" : "0x98ff921201554726367d2be8c804a7ff89ccf285ebc57dff8ae4c44b9c19ac4a",
-            "s" : "0x1887321be575c8095f789dd4c743dfe42c1820f9231f98a962b210e3ac2452a3"
-        }
-    }
-}
diff --git a/src/TransactionTestsFiller/ttVRuleEip158/RSsecp256k1Filler.json b/src/TransactionTestsFiller/ttVRuleEip158/RSsecp256k1Filler.json
deleted file mode 100644
index 16fa7d81a..000000000
--- a/src/TransactionTestsFiller/ttVRuleEip158/RSsecp256k1Filler.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-    "RSsecp256k1" : {
-	"expect" : "invalid",
-	"blocknumber" : "2675000",
-	"transaction" : {
-            "data" : "0x",
-            "gasLimit" : "21000",
-            "gasPrice" : "1",
-            "nonce" : "3",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-            "value" : "10",
-            "v" : "38",
-            "r" : "0xfffffffffffffffffffffffffffffffebaaedce6af48a03bbfd25e8cd0364141",
-            "s" : "0xfffffffffffffffffffffffffffffffebaaedce6af48a03bbfd25e8cd0364141"
-        }
-    }
-}
diff --git a/src/TransactionTestsFiller/ttVRuleEip158/RightVRSTestFiller.json b/src/TransactionTestsFiller/ttVRuleEip158/RightVRSTestFiller.json
deleted file mode 100644
index 588ae1e1d..000000000
--- a/src/TransactionTestsFiller/ttVRuleEip158/RightVRSTestFiller.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "RightVRSTest" : {
-	"expect" : "valid",
-	"blocknumber" : "2675000",
-        "transaction" :
-        {
-            "data" : "0x",
-            "gasLimit" : "21000",
-            "gasPrice" : "1",
-            "nonce" : "3",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-            "value" : "10",
-            "v" : "38",
-            "r" : "0x98ff921201554726367d2be8c804a7ff89ccf285ebc57dff8ae4c44b9c19ac4a",
-            "s" : "0x1887321be575c8095f789dd4c743dfe42c1820f9231f98a962b210e3ac2452a3"
-        }
-    }
-}
diff --git a/src/TransactionTestsFiller/ttVRuleEip158/SenderTestFiller.json b/src/TransactionTestsFiller/ttVRuleEip158/SenderTestFiller.json
deleted file mode 100644
index 57b38d8a5..000000000
--- a/src/TransactionTestsFiller/ttVRuleEip158/SenderTestFiller.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-    "SenderTest" : {
-        "senderExpect" : "sender 963f4a0d8a11b758de8d5b99ab4ac898d6438ea6",
-	"expect" : "valid",
-	"blocknumber" : "2675000",
-        "transaction" :
-        {
-            "data" : "",
-            "gasLimit" : "21000",
-            "gasPrice" : "1",
-            "nonce" : "0",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
-            "value" : "10",
-            "v" : "37",
-            "r" : "0x48b55bfa915ac795c431978d8a6a992b628d557da5ff759b307d495a36649353",
-            "s" : "secretkey 45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "s" : "0x1fffd310ac743f371de3b9f7f9cb56c0b28ad43601b4ab949f53faa07bd2c804"
-        }
-    }
-}
diff --git a/src/TransactionTestsFiller/ttVRuleEip158/TransactionWithGasLimitOverflow2Filler.json b/src/TransactionTestsFiller/ttVRuleEip158/TransactionWithGasLimitOverflow2Filler.json
deleted file mode 100644
index fc34cf659..000000000
--- a/src/TransactionTestsFiller/ttVRuleEip158/TransactionWithGasLimitOverflow2Filler.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-    "TransactionWithGasLimitOverflow2" : {
-	"expect" : "valid",
-	"blocknumber" : "2675000",
-        "transaction" :
-        {
-            "data" : "",
-            "gasLimit" : "2^63",
-            "gasLimit" : "9223372036854775808",
-            "gasPrice" : "1",
-            "nonce" : "0",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
-            "value" : "11",
-            "v" : "37",
-            "r" : "0x48b55bfa915ac795c431978d8a6a992b628d557da5ff759b307d495a36649353",
-            "s" : "0x1887321be575c8095f789dd4c743dfe42c1820f9231f98a962b210e3ac2452a3"
-        }
-    }
-}
diff --git a/src/TransactionTestsFiller/ttVRuleEip158/TransactionWithGasLimitOverflow63Filler.json b/src/TransactionTestsFiller/ttVRuleEip158/TransactionWithGasLimitOverflow63Filler.json
deleted file mode 100644
index 4651d8481..000000000
--- a/src/TransactionTestsFiller/ttVRuleEip158/TransactionWithGasLimitOverflow63Filler.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "TransactionWithGasLimitOverflow63" : {
-	"expect" : "valid",
-	"blocknumber" : "2675000",
-	"transaction" :
-	{
-		"data" : "",
-		"gasLimit" : "9223372036854775808",
-		"gasPrice" : "1",
-		"nonce" : "0",
-		"to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
-		"value" : "11",
-		"v" : "37",
-		"r" : "0x48b55bfa915ac795c431978d8a6a992b628d557da5ff759b307d495a36649353",
-		"s" : "0x1887321be575c8095f789dd4c743dfe42c1820f9231f98a962b210e3ac2452a3"
-	}
-    }
-}
diff --git a/src/TransactionTestsFiller/ttVRuleEip158/TransactionWithGasLimitOverflow63_1Filler.json b/src/TransactionTestsFiller/ttVRuleEip158/TransactionWithGasLimitOverflow63_1Filler.json
deleted file mode 100644
index e49eef8b0..000000000
--- a/src/TransactionTestsFiller/ttVRuleEip158/TransactionWithGasLimitOverflow63_1Filler.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "TransactionWithGasLimitOverflow63_1" : {
-	"expect" : "valid",
-	"blocknumber" : "2675000",
-	"transaction" :
-	{
-		"data" : "",
-		"gasLimit" : "9223372036854775809",
-		"gasPrice" : "1",
-		"nonce" : "0",
-		"to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
-		"value" : "11",
-		"v" : "37",
-		"r" : "0x48b55bfa915ac795c431978d8a6a992b628d557da5ff759b307d495a36649353",
-		"s" : "0x1887321be575c8095f789dd4c743dfe42c1820f9231f98a962b210e3ac2452a3"
-	}
-    }
-}
diff --git a/src/TransactionTestsFiller/ttVRuleEip158/TransactionWithGasLimitOverflowFiller.json b/src/TransactionTestsFiller/ttVRuleEip158/TransactionWithGasLimitOverflowFiller.json
deleted file mode 100644
index b54f5ad4e..000000000
--- a/src/TransactionTestsFiller/ttVRuleEip158/TransactionWithGasLimitOverflowFiller.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "TransactionWithGasLimitOverflow" : {
-	"expect" : "invalid",
-	"blocknumber" : "2675000",
-        "transaction" :
-        {
-            "data" : "",
-            "gasLimit" : "115792089237316195423570985008687907853269984665640564039457584007913129639936",
-            "gasPrice" : "1",
-            "nonce" : "0",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
-            "value" : "11",
-            "v" : "38",
-            "r" : "0x48b55bfa915ac795c431978d8a6a992b628d557da5ff759b307d495a36649353",
-            "s" : "0x1887321be575c8095f789dd4c743dfe42c1820f9231f98a962b210e3ac2452a3"
-        }
-    }
-}
diff --git a/src/TransactionTestsFiller/ttVRuleEip158/TransactionWithGasLimitxPriceOverflow2Filler.json b/src/TransactionTestsFiller/ttVRuleEip158/TransactionWithGasLimitxPriceOverflow2Filler.json
deleted file mode 100644
index 36cbe2887..000000000
--- a/src/TransactionTestsFiller/ttVRuleEip158/TransactionWithGasLimitxPriceOverflow2Filler.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "TransactionWithGasLimitxPriceOverflow2" : {
-	"expect" : "valid",
-	"blocknumber" : "2675000",
-        "transaction" :
-        {
-            "data" : "",
-            "gasLimit" : "10000000",
-            "gasPrice" : "16769767339735900",
-            "nonce" : "0",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
-            "value" : "0",
-            "v" : "37",
-            "r" : "0x98ff921201554726367d2be8c804a7ff89ccf285ebc57dff8ae4c44b9c19ac4a",
-            "s" : "0x1887321be575c8095f789dd4c743dfe42c1820f9231f98a962b210e3ac2452a3"
-        }
-    }
-}
diff --git a/src/TransactionTestsFiller/ttVRuleEip158/TransactionWithGasLimitxPriceOverflowFiller.json b/src/TransactionTestsFiller/ttVRuleEip158/TransactionWithGasLimitxPriceOverflowFiller.json
deleted file mode 100644
index 035967e44..000000000
--- a/src/TransactionTestsFiller/ttVRuleEip158/TransactionWithGasLimitxPriceOverflowFiller.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "TransactionWithGasLimitxPriceOverflow" : {
-	"expect" : "valid",
-	"blocknumber" : "2675000",
-        "transaction" :
-        {
-            "data" : "",
-            "gasLimit" : "115792089237316195423570985008687907853269984665640564039457584007913129639935",
-            "gasPrice" : "100000000000000000",
-            "nonce" : "0",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
-            "value" : "0",
-            "v" : "38",
-            "r" : "0x48b55bfa915ac795c431978d8a6a992b628d557da5ff759b307d495a36649353",
-            "s" : "0x1887321be575c8095f789dd4c743dfe42c1820f9231f98a962b210e3ac2452a3"
-        }
-    }
-}
diff --git a/src/TransactionTestsFiller/ttVRuleEip158/TransactionWithGasPriceOverflowFiller.json b/src/TransactionTestsFiller/ttVRuleEip158/TransactionWithGasPriceOverflowFiller.json
deleted file mode 100644
index 6485d8840..000000000
--- a/src/TransactionTestsFiller/ttVRuleEip158/TransactionWithGasPriceOverflowFiller.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "TransactionWithGasPriceOverflow" : {
-	"expect" : "invalid",
-	"blocknumber" : "2675000",
-        "transaction" :
-        {
-            "data" : "",
-            "gasLimit" : "21000",
-            "gasPrice" : "115792089237316195423570985008687907853269984665640564039457584007913129639936",
-            "nonce" : "0",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
-            "value" : "11",
-            "v" : "37",
-            "r" : "0x48b55bfa915ac795c431978d8a6a992b628d557da5ff759b307d495a36649353",
-            "s" : "0x1887321be575c8095f789dd4c743dfe42c1820f9231f98a962b210e3ac2452a3"
-        }
-    }
-}
diff --git a/src/TransactionTestsFiller/ttVRuleEip158/TransactionWithHighValueOverflowFiller.json b/src/TransactionTestsFiller/ttVRuleEip158/TransactionWithHighValueOverflowFiller.json
deleted file mode 100644
index 9ebff3a5e..000000000
--- a/src/TransactionTestsFiller/ttVRuleEip158/TransactionWithHighValueOverflowFiller.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "TransactionWithHighValueOverflow" : {
-	"expect" : "invalid",
-	"blocknumber" : "2675000",
-        "transaction" :
-        {
-            "data" : "",
-            "gasLimit" : "21000",
-            "gasPrice" : "1",
-            "nonce" : "0",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
-            "value" : "115792089237316195423570985008687907853269984665640564039457584007913129639936",
-            "v" : "38",
-            "r" : "0x48b55bfa915ac795c431978d8a6a992b628d557da5ff759b307d495a36649353",
-            "s" : "0x1887321be575c8095f789dd4c743dfe42c1820f9231f98a962b210e3ac2452a3"
-        }
-    }
-}
diff --git a/src/TransactionTestsFiller/ttVRuleEip158/TransactionWithHihghGasLimit63m1Filler.json b/src/TransactionTestsFiller/ttVRuleEip158/TransactionWithHihghGasLimit63m1Filler.json
deleted file mode 100644
index 56cade2a8..000000000
--- a/src/TransactionTestsFiller/ttVRuleEip158/TransactionWithHihghGasLimit63m1Filler.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-    "TransactionWithHihghGasLimit63m1" : {
-	"expect" : "valid",
-	"blocknumber" : "2675000",
-        "transaction" :
-        {
-            "data" : "",
-	    "gasLimit" : "2^63 - 1",
-            "gasLimit" : "9223372036854775807",
-            "gasPrice" : "1",
-            "nonce" : "0",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
-            "value" : "0",
-            "v" : "37",
-            "r" : "0x98ff921201554726367d2be8c804a7ff89ccf285ebc57dff8ae4c44b9c19ac4a",
-            "s" : "0x1887321be575c8095f789dd4c743dfe42c1820f9231f98a962b210e3ac2452a3"
-        }
-    }
-}
diff --git a/src/TransactionTestsFiller/ttVRuleEip158/TransactionWithHihghGasPrice2Filler.json b/src/TransactionTestsFiller/ttVRuleEip158/TransactionWithHihghGasPrice2Filler.json
deleted file mode 100644
index 1abd0e635..000000000
--- a/src/TransactionTestsFiller/ttVRuleEip158/TransactionWithHihghGasPrice2Filler.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "TransactionWithHihghGasPrice2" : {
-	"expect" : "valid",
-	"blocknumber" : "2675000",
-        "transaction" :
-        {
-            "data" : "",
-            "gasLimit" : "55000",
-            "gasPrice" : "167697673397359",
-            "nonce" : "0",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
-            "value" : "0",
-            "v" : "37",
-            "r" : "0x98ff921201554726367d2be8c804a7ff89ccf285ebc57dff8ae4c44b9c19ac4a",
-            "s" : "0x1887321be575c8095f789dd4c743dfe42c1820f9231f98a962b210e3ac2452a3"
-        }
-    }
-}
diff --git a/src/TransactionTestsFiller/ttVRuleEip158/TransactionWithHihghGasPriceFiller.json b/src/TransactionTestsFiller/ttVRuleEip158/TransactionWithHihghGasPriceFiller.json
deleted file mode 100644
index e89ce0868..000000000
--- a/src/TransactionTestsFiller/ttVRuleEip158/TransactionWithHihghGasPriceFiller.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "TransactionWithHihghGasPrice" : {
-	"expect" : "valid",
-	"blocknumber" : "2675000",
-        "transaction" :
-        {
-            "data" : "",
-            "gasLimit" : "21000",
-            "gasPrice" : "115792089237316195423570985008687907853269984665640564039457584007913129639935",
-            "nonce" : "0",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
-            "value" : "0",
-            "v" : "38",
-            "r" : "0x98ff921201554726367d2be8c804a7ff89ccf285ebc57dff8ae4c44b9c19ac4a",
-            "s" : "0x1887321be575c8095f789dd4c743dfe42c1820f9231f98a962b210e3ac2452a3"
-        }
-    }
-}
diff --git a/src/TransactionTestsFiller/ttVRuleEip158/TransactionWithHihghNonce256Filler.json b/src/TransactionTestsFiller/ttVRuleEip158/TransactionWithHihghNonce256Filler.json
deleted file mode 100644
index 346f2ad85..000000000
--- a/src/TransactionTestsFiller/ttVRuleEip158/TransactionWithHihghNonce256Filler.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "TransactionWithHihghNonce256" : {
-	"expect" : "valid",
-	"blocknumber" : "2675000",
-        "transaction" :
-        {
-            "data" : "",
-            "gasLimit" : "21000",
-            "gasPrice" : "1",
-            "nonce" : "115792089237316195423570985008687907853269984665640564039457584007913129639935",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
-            "value" : "0",
-            "v" : "38",
-            "r" : "0x48b55bfa915ac795c431978d8a6a992b628d557da5ff759b307d495a36649353",
-            "s" : "0x1fffd310ac743f371de3b9f7f9cb56c0b28ad43601b4ab949f53faa07bd2c804"
-        }
-    }
-}
diff --git a/src/TransactionTestsFiller/ttVRuleEip158/TransactionWithHihghNonce32Filler.json b/src/TransactionTestsFiller/ttVRuleEip158/TransactionWithHihghNonce32Filler.json
deleted file mode 100644
index afc87b9bd..000000000
--- a/src/TransactionTestsFiller/ttVRuleEip158/TransactionWithHihghNonce32Filler.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "TransactionWithHihghNonce32" : {
-	"expect" : "valid",
-	"blocknumber" : "2675000",
-        "transaction" :
-        {
-            "data" : "",
-            "gasLimit" : "21000",
-            "gasPrice" : "1",
-            "nonce" : "4294967296",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
-            "value" : "0",
-            "v" : "37",
-            "r" : "0x48b55bfa915ac795c431978d8a6a992b628d557da5ff759b307d495a36649353",
-            "s" : "0x1fffd310ac743f371de3b9f7f9cb56c0b28ad43601b4ab949f53faa07bd2c804"
-        }
-    }
-}
diff --git a/src/TransactionTestsFiller/ttVRuleEip158/TransactionWithHihghValueFiller.json b/src/TransactionTestsFiller/ttVRuleEip158/TransactionWithHihghValueFiller.json
deleted file mode 100644
index 56902d333..000000000
--- a/src/TransactionTestsFiller/ttVRuleEip158/TransactionWithHihghValueFiller.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "TransactionWithHihghValue" : {
-	"expect" : "valid",
-	"blocknumber" : "2675000",
-        "transaction" :
-        {
-            "data" : "",
-            "gasLimit" : "21000",
-            "gasPrice" : "1",
-            "nonce" : "0",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
-            "value" : "115792089237316195423570985008687907853269984665640564039457584007913129639935",
-            "v" : "37",
-            "r" : "0x48b55bfa915ac795c431978d8a6a992b628d557da5ff759b307d495a36649353",
-            "s" : "0x1fffd310ac743f371de3b9f7f9cb56c0b28ad43601b4ab949f53faa07bd2c804"
-        }
-    }
-}
diff --git a/src/TransactionTestsFiller/ttVRuleEip158/TransactionWithNonceOverflowFiller.json b/src/TransactionTestsFiller/ttVRuleEip158/TransactionWithNonceOverflowFiller.json
deleted file mode 100644
index 05cf4fcef..000000000
--- a/src/TransactionTestsFiller/ttVRuleEip158/TransactionWithNonceOverflowFiller.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "TransactionWithNonceOverflow" : {
-	"expect" : "invalid",
-	"blocknumber" : "2675000",
-        "transaction" :
-        {
-            "data" : "",
-            "gasLimit" : "21000",
-            "gasPrice" : "1",
-            "nonce" : "115792089237316195423570985008687907853269984665640564039457584007913129639936",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
-            "value" : "11",
-            "v" : "38",
-            "r" : "0x48b55bfa915ac795c431978d8a6a992b628d557da5ff759b307d495a36649353",
-            "s" : "0x1887321be575c8095f789dd4c743dfe42c1820f9231f98a962b210e3ac2452a3"
-        }
-    }
-}
diff --git a/src/TransactionTestsFiller/ttVRuleEip158/TransactionWithRSvalue0Filler.json b/src/TransactionTestsFiller/ttVRuleEip158/TransactionWithRSvalue0Filler.json
deleted file mode 100644
index 3a1a51d53..000000000
--- a/src/TransactionTestsFiller/ttVRuleEip158/TransactionWithRSvalue0Filler.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "TransactionWithRSvalue0" : {
-	"expect" : "invalid",
-	"blocknumber" : "2675000",
-        "transaction" :
-        {
-            "data" : "",
-            "gasLimit" : "21000",
-            "gasPrice" : "1",
-            "nonce" : "0",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
-            "value" : "11",
-            "v" : "37",
-            "r" : "0",
-            "s" : "0"
-        }
-    }
-}
diff --git a/src/TransactionTestsFiller/ttVRuleEip158/TransactionWithRSvalue1Filler.json b/src/TransactionTestsFiller/ttVRuleEip158/TransactionWithRSvalue1Filler.json
deleted file mode 100644
index e9b713d59..000000000
--- a/src/TransactionTestsFiller/ttVRuleEip158/TransactionWithRSvalue1Filler.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "TransactionWithRSvalue1" : {
-	"expect" : "valid",
-	"blocknumber" : "2675000",
-        "transaction" :
-        {
-            "data" : "",
-            "gasLimit" : "21000",
-            "gasPrice" : "1",
-            "nonce" : "0",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
-            "value" : "11",
-            "v" : "38",
-            "r" : "1",
-            "s" : "1"
-        }
-    }
-}
diff --git a/src/TransactionTestsFiller/ttVRuleEip158/TransactionWithRvalue0Filler.json b/src/TransactionTestsFiller/ttVRuleEip158/TransactionWithRvalue0Filler.json
deleted file mode 100644
index a8941ee7a..000000000
--- a/src/TransactionTestsFiller/ttVRuleEip158/TransactionWithRvalue0Filler.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "TransactionWithRvalue0" : {
-	"expect" : "invalid",
-	"blocknumber" : "2675000",
-        "transaction" :
-        {
-            "data" : "",
-            "gasLimit" : "21000",
-            "gasPrice" : "1",
-            "nonce" : "0",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
-            "value" : "11",
-            "v" : "38",
-            "r" : "0",
-            "s" : "0x1887321be575c8095f789dd4c743dfe42c1820f9231f98a962b210e3ac2452a3"
-        }
-    }
-}
diff --git a/src/TransactionTestsFiller/ttVRuleEip158/TransactionWithRvalue1Filler.json b/src/TransactionTestsFiller/ttVRuleEip158/TransactionWithRvalue1Filler.json
deleted file mode 100644
index ded6b92ed..000000000
--- a/src/TransactionTestsFiller/ttVRuleEip158/TransactionWithRvalue1Filler.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "TransactionWithRvalue1" : {
-	"expect" : "valid",
-	"blocknumber" : "2675000",
-        "transaction" :
-        {
-            "data" : "",
-            "gasLimit" : "21000",
-            "gasPrice" : "1",
-            "nonce" : "0",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
-            "value" : "11",
-            "v" : "37",
-            "r" : "0x01",
-            "s" : "0x1fffd310ac743f371de3b9f7f9cb56c0b28ad43601b4ab949f53faa07bd2c804"
-        }
-    }
-}
diff --git a/src/TransactionTestsFiller/ttVRuleEip158/TransactionWithRvalueHighFiller.json b/src/TransactionTestsFiller/ttVRuleEip158/TransactionWithRvalueHighFiller.json
deleted file mode 100644
index 0b1b3e5ae..000000000
--- a/src/TransactionTestsFiller/ttVRuleEip158/TransactionWithRvalueHighFiller.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "TransactionWithRvalueHigh" : {
-	"expect" : "invalid",
-	"blocknumber" : "2675000",
-        "transaction" :
-        {
-            "data" : "",
-            "gasLimit" : "21000",
-            "gasPrice" : "1",
-            "nonce" : "0",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
-            "value" : "11",
-            "v" : "37",
-            "r" : "0xfffffffffffffffffffffffffffffffebaaedce6af48a03bbfd25e8cd0364140",
-            "s" : "0x1887321be575c8095f789dd4c743dfe42c1820f9231f98a962b210e3ac2452a3"
-        }
-    }
-}
diff --git a/src/TransactionTestsFiller/ttVRuleEip158/TransactionWithRvalueOverflowFiller.json b/src/TransactionTestsFiller/ttVRuleEip158/TransactionWithRvalueOverflowFiller.json
deleted file mode 100644
index e98143c66..000000000
--- a/src/TransactionTestsFiller/ttVRuleEip158/TransactionWithRvalueOverflowFiller.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "TransactionWithRvalueOverflow" : {
-	"expect" : "invalid",
-	"blocknumber" : "2675000",
-        "transaction" :
-        {
-            "data" : "",
-            "gasLimit" : "21000",
-            "gasPrice" : "1",
-            "nonce" : "0",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
-            "value" : "11",
-            "v" : "38",
-            "r" : "0xfffffffffffffffffffffffffffffffebaaedce6af48a03bbfd25e8cd03641410000",
-            "s" : "0xefffd310ac743f371de3b9f7f9cb56c0b28ad43601b4ab949f53faa07bd2c804"
-        }
-    }
-}
diff --git a/src/TransactionTestsFiller/ttVRuleEip158/TransactionWithRvaluePrefixed00Filler.json b/src/TransactionTestsFiller/ttVRuleEip158/TransactionWithRvaluePrefixed00Filler.json
deleted file mode 100644
index 3aac62328..000000000
--- a/src/TransactionTestsFiller/ttVRuleEip158/TransactionWithRvaluePrefixed00Filler.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "TransactionWithRvaluePrefixed00" : {
-	"expect" : "valid",
-	"blocknumber" : "2675000",
-        "transaction" :
-        {
-            "data" : "",
-            "gasLimit" : "21000",
-            "gasPrice" : "1",
-            "nonce" : "0",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
-            "value" : "11",
-            "v" : "38",
-            "r" : "0xebaaedce6af48a03bbfd25e8cd0364141",
-            "s" : "0x1fffd310ac743f371de3b9f7f9cb56c0b28ad43601b4ab949f53faa07bd2c804"
-        }
-    }
-}
diff --git a/src/TransactionTestsFiller/ttVRuleEip158/TransactionWithRvalueTooHighFiller.json b/src/TransactionTestsFiller/ttVRuleEip158/TransactionWithRvalueTooHighFiller.json
deleted file mode 100644
index 934f68333..000000000
--- a/src/TransactionTestsFiller/ttVRuleEip158/TransactionWithRvalueTooHighFiller.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "TransactionWithRvalueTooHigh" : {
-	"expect" : "invalid",
-	"blocknumber" : "2675000",
-        "transaction" :
-        {
-            "data" : "",
-            "gasLimit" : "21000",
-            "gasPrice" : "1",
-            "nonce" : "0",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
-            "value" : "11",
-            "v" : "37",
-            "r" : "0xfffffffffffffffffffffffffffffffebaaedce6af48a03bbfd25e8cd0364141",
-            "s" : "0x1887321be575c8095f789dd4c743dfe42c1820f9231f98a962b210e3ac2452a3"
-        }
-    }
-}
diff --git a/src/TransactionTestsFiller/ttVRuleEip158/TransactionWithSvalue0Filler.json b/src/TransactionTestsFiller/ttVRuleEip158/TransactionWithSvalue0Filler.json
deleted file mode 100644
index 52b4f76ad..000000000
--- a/src/TransactionTestsFiller/ttVRuleEip158/TransactionWithSvalue0Filler.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "TransactionWithSvalue0" : {
-	"expect" : "invalid",
-	"blocknumber" : "2675000",
-        "transaction" :
-        {
-            "data" : "",
-            "gasLimit" : "21000",
-            "gasPrice" : "1",
-            "nonce" : "0",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
-            "value" : "11",
-            "v" : "38",
-            "r" : "0x48b55bfa915ac795c431978d8a6a992b628d557da5ff759b307d495a36649353",
-            "s" : "0"
-        }
-    }
-}
diff --git a/src/TransactionTestsFiller/ttVRuleEip158/TransactionWithSvalue1Filler.json b/src/TransactionTestsFiller/ttVRuleEip158/TransactionWithSvalue1Filler.json
deleted file mode 100644
index bcce98174..000000000
--- a/src/TransactionTestsFiller/ttVRuleEip158/TransactionWithSvalue1Filler.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "TransactionWithSvalue1" : {
-	"expect" : "valid",
-	"blocknumber" : "2675000",
-        "transaction" :
-        {
-            "data" : "",
-            "gasLimit" : "21000",
-            "gasPrice" : "1",
-            "nonce" : "0",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
-            "value" : "11",
-            "v" : "37",
-            "r" : "0x48b55bfa915ac795c431978d8a6a992b628d557da5ff759b307d495a36649353",
-            "s" : "0x01"
-        }
-    }
-}
diff --git a/src/TransactionTestsFiller/ttVRuleEip158/TransactionWithSvalueEqual_c_secp256k1n_x05Filler.json b/src/TransactionTestsFiller/ttVRuleEip158/TransactionWithSvalueEqual_c_secp256k1n_x05Filler.json
deleted file mode 100644
index c5aa5ae12..000000000
--- a/src/TransactionTestsFiller/ttVRuleEip158/TransactionWithSvalueEqual_c_secp256k1n_x05Filler.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "TransactionWithSvalueEqual_c_secp256k1n_x05" : {
-	"expect" : "valid",
-	"blocknumber" : "2675000",
-        "transaction" :
-        {
-            "data" : "",
-            "gasLimit" : "21000",
-            "gasPrice" : "1",
-            "nonce" : "0",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
-            "value" : "11",
-            "v" : "38",
-            "r" : "0x48b55bfa915ac795c431978d8a6a992b628d557da5ff759b307d495a36649353",
-            "s" : "0x7fffffffffffffffffffffffffffffff5d576e7357a4501ddfe92f46681b20a0"
-        }
-    }
-}
diff --git a/src/TransactionTestsFiller/ttVRuleEip158/TransactionWithSvalueHighFiller.json b/src/TransactionTestsFiller/ttVRuleEip158/TransactionWithSvalueHighFiller.json
deleted file mode 100644
index f6c316574..000000000
--- a/src/TransactionTestsFiller/ttVRuleEip158/TransactionWithSvalueHighFiller.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "TransactionWithSvalueHigh" : {
-	"expect" : "invalid",
-	"blocknumber" : "2675000",
-        "transaction" :
-        {
-            "data" : "",
-            "gasLimit" : "21000",
-            "gasPrice" : "1",
-            "nonce" : "0",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
-            "value" : "11",
-            "v" : "37",
-            "r" : "0x48b55bfa915ac795c431978d8a6a992b628d557da5ff759b307d495a36649353",
-            "s" : "0xfffffffffffffffffffffffffffffffebaaedce6af48a03bbfd25e8cd0364140"
-        }
-    }
-}
diff --git a/src/TransactionTestsFiller/ttVRuleEip158/TransactionWithSvalueLargerThan_c_secp256k1n_x05Filler.json b/src/TransactionTestsFiller/ttVRuleEip158/TransactionWithSvalueLargerThan_c_secp256k1n_x05Filler.json
deleted file mode 100644
index e8b1f9939..000000000
--- a/src/TransactionTestsFiller/ttVRuleEip158/TransactionWithSvalueLargerThan_c_secp256k1n_x05Filler.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "TransactionWithSvalueLargerThan_c_secp256k1n_x05" : {
-	"expect" : "invalid",
-	"blocknumber" : "2675000",
-        "transaction" :
-        {
-            "data" : "",
-            "gasLimit" : "21000",
-            "gasPrice" : "1",
-            "nonce" : "0",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
-            "value" : "11",
-            "v" : "37",
-            "r" : "0x48b55bfa915ac795c431978d8a6a992b628d557da5ff759b307d495a36649353",
-            "s" : "0x7fffffffffffffffffffffffffffffff5d576e7357a4501ddfe92f46681b20a1"
-        }
-    }
-}
diff --git a/src/TransactionTestsFiller/ttVRuleEip158/TransactionWithSvalueLessThan_c_secp256k1n_x05Filler.json b/src/TransactionTestsFiller/ttVRuleEip158/TransactionWithSvalueLessThan_c_secp256k1n_x05Filler.json
deleted file mode 100644
index 4df1a1124..000000000
--- a/src/TransactionTestsFiller/ttVRuleEip158/TransactionWithSvalueLessThan_c_secp256k1n_x05Filler.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "TransactionWithSvalueLessThan_c_secp256k1n_x05" : {
-	"expect" : "valid",
-	"blocknumber" : "2675000",
-        "transaction" :
-        {
-            "data" : "",
-            "gasLimit" : "21000",
-            "gasPrice" : "1",
-            "nonce" : "0",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
-            "value" : "11",
-            "v" : "37",
-            "r" : "0x48b55bfa915ac795c431978d8a6a992b628d557da5ff759b307d495a36649353",
-            "s" : "0x7fffffffffffffffffffffffffffffff5d576e7357a4501ddfe92f46681b2090"
-        }
-    }
-}
diff --git a/src/TransactionTestsFiller/ttVRuleEip158/TransactionWithSvalueOverflowFiller.json b/src/TransactionTestsFiller/ttVRuleEip158/TransactionWithSvalueOverflowFiller.json
deleted file mode 100644
index 28f435ba6..000000000
--- a/src/TransactionTestsFiller/ttVRuleEip158/TransactionWithSvalueOverflowFiller.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "TransactionWithSvalueOverflow" : {
-	"expect" : "invalid",
-	"blocknumber" : "2675000",
-        "transaction" :
-        {
-            "data" : "",
-            "gasLimit" : "21000",
-            "gasPrice" : "1",
-            "nonce" : "0",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
-            "value" : "11",
-            "v" : "37",
-            "r" : "0x48b55bfa915ac795c431978d8a6a992b628d557da5ff759b307d495a36649353",
-            "s" : "0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2f0000"
-        }
-    }
-}
diff --git a/src/TransactionTestsFiller/ttVRuleEip158/TransactionWithSvaluePrefixed00Filler.json b/src/TransactionTestsFiller/ttVRuleEip158/TransactionWithSvaluePrefixed00Filler.json
deleted file mode 100644
index 99f20fb01..000000000
--- a/src/TransactionTestsFiller/ttVRuleEip158/TransactionWithSvaluePrefixed00Filler.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "TransactionWithSvaluePrefixed00" : {
-	"expect" : "valid",
-	"blocknumber" : "2675000",
-        "transaction" :
-        {
-            "data" : "",
-            "gasLimit" : "21000",
-            "gasPrice" : "1",
-            "nonce" : "0",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
-            "value" : "11",
-            "v" : "37",
-            "r" : "0x98ff921201554726367d2be8c804a7ff89ccf285ebc57dff8ae4c44b9c19ac4a",
-            "s" : "0xef0b28ad43601b4ab949f53faa07bd2c804"
-        }
-    }
-}
diff --git a/src/TransactionTestsFiller/ttVRuleEip158/TransactionWithSvalueTooHighFiller.json b/src/TransactionTestsFiller/ttVRuleEip158/TransactionWithSvalueTooHighFiller.json
deleted file mode 100644
index 35cdd3fd7..000000000
--- a/src/TransactionTestsFiller/ttVRuleEip158/TransactionWithSvalueTooHighFiller.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "TransactionWithSvalueTooHigh" : {
-	"expect" : "invalid",
-	"blocknumber" : "2675000",
-        "transaction" :
-        {
-            "data" : "",
-            "gasLimit" : "21000",
-            "gasPrice" : "1",
-            "nonce" : "0",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
-            "value" : "11",
-            "v" : "38",
-            "r" : "0x48b55bfa915ac795c431978d8a6a992b628d557da5ff759b307d495a36649353",
-            "s" : "0xfffffffffffffffffffffffffffffffebaaedce6af48a03bbfd25e8cd0364141"
-        }
-    }
-}
diff --git a/src/TransactionTestsFiller/ttVRuleEip158/TransactionWithTooFewRLPElementsFiller.json b/src/TransactionTestsFiller/ttVRuleEip158/TransactionWithTooFewRLPElementsFiller.json
deleted file mode 100644
index d3e8ce167..000000000
--- a/src/TransactionTestsFiller/ttVRuleEip158/TransactionWithTooFewRLPElementsFiller.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-    "TransactionWithTooFewRLPElements" : {
-	"expect" : "invalid",
-	"blocknumber" : "2675000",
-        "transaction" :
-        {
-            "data" : "",
-            "gasPrice" : "1",
-            "nonce" : "0",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
-            "v" : "38",
-            "r" : "0x48b55bfa915ac795c431978d8a6a992b628d557da5ff759b307d495a36649353",
-            "s" : "0x1887321be575c8095f789dd4c743dfe42c1820f9231f98a962b210e3ac2452a3"
-        }
-    }
-}
diff --git a/src/TransactionTestsFiller/ttVRuleEip158/TransactionWithTooManyRLPElementsFiller.json b/src/TransactionTestsFiller/ttVRuleEip158/TransactionWithTooManyRLPElementsFiller.json
deleted file mode 100644
index e758fb627..000000000
--- a/src/TransactionTestsFiller/ttVRuleEip158/TransactionWithTooManyRLPElementsFiller.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-    "TransactionWithTooManyRLPElements" : {
-	"expect" : "invalid",
-	"blocknumber" : "2675000",
-        "transaction" :
-        {
-            "data" : "",
-            "gasLimit" : "21000",
-            "gasPrice" : "1",
-            "nonce" : "0",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
-            "value" : "10",
-            "v" : "37",
-            "r" : "0x48b55bfa915ac795c431978d8a6a992b628d557da5ff759b307d495a36649353",
-            "s" : "0x1887321be575c8095f789dd4c743dfe42c1820f9231f98a962b210e3ac2452a3",
-            "extrafield" : "128472387293"
-        }
-    }
-}
diff --git a/src/TransactionTestsFiller/ttVRuleEip158/WrongVRSTestIncorrectSizeFiller.json b/src/TransactionTestsFiller/ttVRuleEip158/WrongVRSTestIncorrectSizeFiller.json
deleted file mode 100644
index 95b345a5f..000000000
--- a/src/TransactionTestsFiller/ttVRuleEip158/WrongVRSTestIncorrectSizeFiller.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "WrongVRSTestIncorrectSize" : {
-	"expect" : "invalid",
-	"blocknumber" : "2675000",
-        "transaction" :
-        {
-            "data" : "",
-            "gasLimit" : "21000",
-            "gasPrice" : "1",
-            "nonce" : "0",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-            "value" : "10",
-            "v" : "38",
-            "r" : "0x98ff921201554726367d2be8c804a7ff89ccf285ebc57dff8ae4c44b9c19ac4a02c3",
-            "s" : "0x1887321be575c8095f789dd4c743dfe42c1820f9231f98a962b210e3ac2452a3"
-        }
-    }
-}
diff --git a/src/TransactionTestsFiller/ttVRuleEip158/WrongVRSTestVEqual36Filler.json b/src/TransactionTestsFiller/ttVRuleEip158/WrongVRSTestVEqual36Filler.json
deleted file mode 100644
index 0e3abbc87..000000000
--- a/src/TransactionTestsFiller/ttVRuleEip158/WrongVRSTestVEqual36Filler.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "WrongVRSTestVEqual36" : {
-	"expect" : "invalid",
-	"blocknumber" : "2675000",
-        "transaction" :
-        {
-            "data" : "",
-            "gasLimit" : "21000",
-            "gasPrice" : "1",
-            "nonce" : "0",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-            "value" : "10",
-            "v" : "36",
-            "r" : "0x98ff921201554726367d2be8c804a7ff89ccf285ebc57dff8ae4c44b9c19ac4a",
-            "s" : "0x1887321be575c8095f789dd4c743dfe42c1820f9231f98a962b210e3ac2452a3"
-        }
-    }
-}
diff --git a/src/TransactionTestsFiller/ttVRuleEip158/WrongVRSTestVEqual39Filler.json b/src/TransactionTestsFiller/ttVRuleEip158/WrongVRSTestVEqual39Filler.json
deleted file mode 100644
index 03b208dae..000000000
--- a/src/TransactionTestsFiller/ttVRuleEip158/WrongVRSTestVEqual39Filler.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "WrongVRSTestVEqual39" : {
-	"expect" : "invalid",
-	"blocknumber" : "2675000",
-        "transaction" :
-        {
-            "data" : "",
-            "gasLimit" : "21000",
-            "gasPrice" : "1",
-            "nonce" : "0",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-            "value" : "10",
-            "v" : "39",
-            "r" : "0x98ff921201554726367d2be8c804a7ff89ccf285ebc57dff8ae4c44b9c19ac4a",
-            "s" : "0x1887321be575c8095f789dd4c743dfe42c1820f9231f98a962b210e3ac2452a3"
-        }
-    }
-}
diff --git a/src/TransactionTestsFiller/ttVRuleEip158/WrongVRSTestVEqual41Filler.json b/src/TransactionTestsFiller/ttVRuleEip158/WrongVRSTestVEqual41Filler.json
deleted file mode 100644
index f28a10435..000000000
--- a/src/TransactionTestsFiller/ttVRuleEip158/WrongVRSTestVEqual41Filler.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "WrongVRSTestVEqual41" : {
-	"expect" : "invalid",
-	"blocknumber" : "2675000",
-        "transaction" :
-        {
-            "data" : "",
-            "gasLimit" : "21000",
-            "gasPrice" : "1",
-            "nonce" : "0",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-            "value" : "10",
-            "v" : "41",
-            "r" : "0x98ff921201554726367d2be8c804a7ff89ccf285ebc57dff8ae4c44b9c19ac4a",
-            "s" : "0x1887321be575c8095f789dd4c743dfe42c1820f9231f98a962b210e3ac2452a3"
-        }
-    }
-}
diff --git a/src/TransactionTestsFiller/ttVRuleEip158/dataTx_bcValidBlockTestFiller.json b/src/TransactionTestsFiller/ttVRuleEip158/dataTx_bcValidBlockTestFiller.json
deleted file mode 100644
index 34ddf0f92..000000000
--- a/src/TransactionTestsFiller/ttVRuleEip158/dataTx_bcValidBlockTestFiller.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-    "dataTx_bcValidBlockTest": {
-	"expect" : "valid",
-	"blocknumber" : "2675000",
-        "transaction": {
-            "nonce": "0",
-            "gasPrice": "50",
-            "gasLimit": "80000",
-            "to": "",
-            "data": "0x60056013565b6101918061001d6000396000f35b3360008190555056006001600060e060020a6000350480630a874df61461003a57806341c0e1b514610058578063a02b161e14610066578063dbbdf0831461007757005b610045600435610149565b80600160a060020a031660005260206000f35b610060610161565b60006000f35b6100716004356100d4565b60006000f35b61008560043560243561008b565b60006000f35b600054600160a060020a031632600160a060020a031614156100ac576100b1565b6100d0565b8060018360005260205260406000208190555081600060005260206000a15b5050565b600054600160a060020a031633600160a060020a031614158015610118575033600160a060020a0316600182600052602052604060002054600160a060020a031614155b61012157610126565b610146565b600060018260005260205260406000208190555080600060005260206000a15b50565b60006001826000526020526040600020549050919050565b600054600160a060020a031633600160a060020a0316146101815761018f565b600054600160a060020a0316ff5b56",
-            "r" : "0xc5689ed1ad124753d54576dfb4b571465a41900a1dff4058d8adf16f752013d0",
-            "s" : "0x1221cbd70ec28c94a3b55ec771bcbc70778d6ee0b51ca7ea9514594c861b1884",
-            "v": "38",
-            "value": "0"
-        }
-    }
-}
diff --git a/src/TransactionTestsFiller/ttVRuleEip158/invalidSignatureFiller.json b/src/TransactionTestsFiller/ttVRuleEip158/invalidSignatureFiller.json
deleted file mode 100644
index b0c05c311..000000000
--- a/src/TransactionTestsFiller/ttVRuleEip158/invalidSignatureFiller.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-    "invalidSignature" : {
-        "expect" : "invalid",
-	"blocknumber" : "2675000",
-        "transaction" : {
-            "data" : "",
-            "gasLimit" : "1000000",
-            "gasPrice" : "0",
-            "nonce" : "0",
-            "r" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
-            "s" : "0xbadf00d70ec28c94a3b55ec771bcbc70778d6ee0b51ca7ea9514594c861b1884",
-            "v": "37",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
-            "value" : "100000"
-        }
-     }
-}
diff --git a/src/TransactionTestsFiller/ttVRuleEip158/libsecp256k1testFiller.json b/src/TransactionTestsFiller/ttVRuleEip158/libsecp256k1testFiller.json
deleted file mode 100644
index 9c1909a59..000000000
--- a/src/TransactionTestsFiller/ttVRuleEip158/libsecp256k1testFiller.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-    "libsecp256k1test": {
-	"expect" : "valid",
-	"blocknumber" : "2675000",
-        "transaction": {
-            "nonce": "0",
-            "gasPrice": "0x09184e72a000",
-            "gasLimit": "0xf388",
-            "to": "",
-            "data": "0x",
-            "r": "44",
-            "s": "4",
-            "v": "37",
-            "value": "0"
-        }
-    }
-}
diff --git a/src/TransactionTestsFiller/ttVRuleEip158/unpadedRValueFiller.json b/src/TransactionTestsFiller/ttVRuleEip158/unpadedRValueFiller.json
deleted file mode 100644
index 7c2818a22..000000000
--- a/src/TransactionTestsFiller/ttVRuleEip158/unpadedRValueFiller.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-    "unpadedRValue": {
-	"expect" : "valid",
-	"blocknumber" : "2675000",
-        "transaction": {
-            "nonce": "13",
-            "gasPrice": "0x09184e72a000",
-            "gasLimit": "0xf710",
-            "to": "7c47ef93268a311f4cad0c750724299e9b72c268",
-            "data": "0x379607f50000000000000000000000000000000000000000000000000000000000000005",
-            "r": "0x006ab6dda9f4df56ea45583af36660329147f1753f3724ea5eb9ed83e812ca77",
-            "s": "0x495701e230667832c8999e884e366a61028633ecf951e8cd66d119f381ae5718",
-            "v": "38",
-            "value": ""
-        }
-    }
-}