Merge pull request #1236 from tgerring/ethtest

ethtest improvements

1 files changed, 4 insertions, 22 deletions

diff --git a/tests/transaction_test.go b/tests/transaction_test.go
index 7ae1c8788..70aa65cdd 100644
--- a/tests/transaction_test.go
+++ b/tests/transaction_test.go
@@ -1,44 +1,26 @@
 package tests
 
 import (
+	"path/filepath"
 	"testing"
 )
 
 func TestTransactions(t *testing.T) {
-	notWorking := make(map[string]bool, 100)
-
-	// TODO: all these tests should work! remove them from the array when they work
-	snafus := []string{
-		"TransactionWithHihghNonce256", // fails due to testing upper bound of 256 bit nonce
-	}
-
-	for _, name := range snafus {
-		notWorking[name] = true
-	}
-
-	var err error
-	err = RunTransactionTests("./files/TransactionTests/ttTransactionTest.json",
-		notWorking)
+	err := RunTransactionTests(filepath.Join(transactionTestDir, "ttTransactionTest.json"), TransSkipTests)
 	if err != nil {
 		t.Fatal(err)
 	}
 }
 
 func TestWrongRLPTransactions(t *testing.T) {
-	notWorking := make(map[string]bool, 100)
-	var err error
-	err = RunTransactionTests("./files/TransactionTests/ttWrongRLPTransaction.json",
-		notWorking)
+	err := RunTransactionTests(filepath.Join(transactionTestDir, "ttWrongRLPTransaction.json"), TransSkipTests)
 	if err != nil {
 		t.Fatal(err)
 	}
 }
 
 func Test10MBtx(t *testing.T) {
-	notWorking := make(map[string]bool, 100)
-	var err error
-	err = RunTransactionTests("./files/TransactionTests/tt10mbDataField.json",
-		notWorking)
+	err := RunTransactionTests(filepath.Join(transactionTestDir, "tt10mbDataField.json"), TransSkipTests)
 	if err != nil {
 		t.Fatal(err)
 	}