From 79eb40fc9f6e93062abb1875b90f8356109ac59a Mon Sep 17 00:00:00 2001 From: Gustav Simonsson Date: Thu, 7 May 2015 13:03:22 +0200 Subject: [PATCH] Add bcTotalDifficultyTest and unskip now working tx tests --- tests/block_test.go | 4 ++++ tests/transaction_test.go | 6 +----- tests/transaction_test_util.go | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/block_test.go b/tests/block_test.go index 8b1f76a92..79e3335b1 100644 --- a/tests/block_test.go +++ b/tests/block_test.go @@ -44,6 +44,10 @@ func TestBcForkBlockTests(t *testing.T) { runBlockTestsInFile("files/BlockTests/bcForkBlockTest.json", []string{}, t) } +func TestBcTotalDifficulty(t *testing.T) { + runBlockTestsInFile("files/BlockTests/bcTotalDifficultyTest.json", []string{}, t) +} + func runBlockTestsInFile(filepath string, snafus []string, t *testing.T) { bt, err := LoadBlockTests(filepath) if err != nil { diff --git a/tests/transaction_test.go b/tests/transaction_test.go index 60296f679..7ae1c8788 100644 --- a/tests/transaction_test.go +++ b/tests/transaction_test.go @@ -9,9 +9,7 @@ func TestTransactions(t *testing.T) { // TODO: all these tests should work! remove them from the array when they work snafus := []string{ - "TransactionWithHihghNonce", // fails due to testing upper bound of 256 bit nonce - "TransactionWithSvalueHigh", // fails due to C++ wrong ECDSA r,s ranges. see https://github.com/ethereum/yellowpaper/pull/112 - "TransactionWithSvalue0", // Invalid, 0 < s according to YP eq 205. probably typo/copy-paste error + "TransactionWithHihghNonce256", // fails due to testing upper bound of 256 bit nonce } for _, name := range snafus { @@ -36,9 +34,7 @@ func TestWrongRLPTransactions(t *testing.T) { } } -//Not working until it's fields are in HEX func Test10MBtx(t *testing.T) { - t.Skip("Skipped in lieu of HEX encoding fix in this file.") notWorking := make(map[string]bool, 100) var err error err = RunTransactionTests("./files/TransactionTests/tt10mbDataField.json", diff --git a/tests/transaction_test_util.go b/tests/transaction_test_util.go index 0f5790642..82038c3e8 100644 --- a/tests/transaction_test_util.go +++ b/tests/transaction_test_util.go @@ -58,7 +58,7 @@ func runTest(txTest TransactionTest) (err error) { return nil } else { // RLP decoding failed but is expected to succeed (test FAIL) - return errors.New("RLP decoding failed when expected to succeed") + return fmt.Errorf("RLP decoding failed when expected to succeed: ", err) } }