diff options
| -rw-r--r-- | cmd/utils/cmd.go | 2 | ||||
| -rw-r--r-- | tests/block_test.go | 7 | ||||
| -rw-r--r-- | tests/init.go | 20 |
3 files changed, 20 insertions, 9 deletions
diff --git a/cmd/utils/cmd.go b/cmd/utils/cmd.go index 33a6c1cb2..20fc57f92 100644 --- a/cmd/utils/cmd.go +++ b/cmd/utils/cmd.go @@ -132,7 +132,7 @@ func StartEthereum(ethereum *eth.Ethereum) { defer signal.Stop(sigc) <-sigc glog.V(logger.Info).Infoln("Got interrupt, shutting down...") - ethereum.Stop() + go ethereum.Stop() logger.Flush() for i := 10; i > 0; i-- { <-sigc diff --git a/tests/block_test.go b/tests/block_test.go index bdf983786..b014fb52e 100644 --- a/tests/block_test.go +++ b/tests/block_test.go @@ -71,3 +71,10 @@ func TestBcWallet(t *testing.T) { t.Fatal(err) } } + +func TestBcGasPricer(t *testing.T) { + err := RunBlockTest(filepath.Join(blockTestDir, "bcGasPricerTest.json"), BlockSkipTests) + if err != nil { + t.Fatal(err) + } +} diff --git a/tests/init.go b/tests/init.go index 832759f7e..c772ab625 100644 --- a/tests/init.go +++ b/tests/init.go @@ -20,22 +20,26 @@ var ( vmTestDir = filepath.Join(baseDir, "VMTests") BlockSkipTests = []string{ + // Fails in InsertPreState with: computed state root does not + // match genesis block bba25a96 0d8f85c8 Christoph said it will be + // fixed eventually "SimpleTx3", - // TODO: check why these fail + // These tests are not valid, as they are out of scope for RLP and + // the consensus protocol. "BLOCK__RandomByteAtTheEnd", "TRANSCT__RandomByteAtTheEnd", "BLOCK__ZeroByteAtTheEnd", "TRANSCT__ZeroByteAtTheEnd", - - // TODO: why does this fail? should be check in ethash now - "DifficultyIsZero", - - // TODO: why does this fail? - "wrongMixHash", } + + /* Go does not support transaction (account) nonces above 2^64. This + technically breaks consensus but is regarded as "reasonable + engineering constraint" as accounts cannot easily reach such high + nonce values in practice + */ TransSkipTests = []string{"TransactionWithHihghNonce256"} - StateSkipTests = []string{"mload32bitBound_return", "mload32bitBound_return2"} + StateSkipTests = []string{} VmSkipTests = []string{} ) |