Skip to content

Commit 79eb40f

Browse files
author
Gustav Simonsson
committed
Add bcTotalDifficultyTest and unskip now working tx tests
1 parent 2b716ae commit 79eb40f

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

tests/block_test.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,10 @@ func TestBcForkBlockTests(t *testing.T) {
4444
runBlockTestsInFile("files/BlockTests/bcForkBlockTest.json", []string{}, t)
4545
}
4646

47+
func TestBcTotalDifficulty(t *testing.T) {
48+
runBlockTestsInFile("files/BlockTests/bcTotalDifficultyTest.json", []string{}, t)
49+
}
50+
4751
func runBlockTestsInFile(filepath string, snafus []string, t *testing.T) {
4852
bt, err := LoadBlockTests(filepath)
4953
if err != nil {

tests/transaction_test.go

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,7 @@ func TestTransactions(t *testing.T) {
99

1010
// TODO: all these tests should work! remove them from the array when they work
1111
snafus := []string{
12-
"TransactionWithHihghNonce", // fails due to testing upper bound of 256 bit nonce
13-
"TransactionWithSvalueHigh", // fails due to C++ wrong ECDSA r,s ranges. see https://github.com/ethereum/yellowpaper/pull/112
14-
"TransactionWithSvalue0", // Invalid, 0 < s according to YP eq 205. probably typo/copy-paste error
12+
"TransactionWithHihghNonce256", // fails due to testing upper bound of 256 bit nonce
1513
}
1614

1715
for _, name := range snafus {
@@ -36,9 +34,7 @@ func TestWrongRLPTransactions(t *testing.T) {
3634
}
3735
}
3836

39-
//Not working until it's fields are in HEX
4037
func Test10MBtx(t *testing.T) {
41-
t.Skip("Skipped in lieu of HEX encoding fix in this file.")
4238
notWorking := make(map[string]bool, 100)
4339
var err error
4440
err = RunTransactionTests("./files/TransactionTests/tt10mbDataField.json",

tests/transaction_test_util.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ func runTest(txTest TransactionTest) (err error) {
5858
return nil
5959
} else {
6060
// RLP decoding failed but is expected to succeed (test FAIL)
61-
return errors.New("RLP decoding failed when expected to succeed")
61+
return fmt.Errorf("RLP decoding failed when expected to succeed: ", err)
6262
}
6363
}
6464

0 commit comments

Comments
 (0)