diff options
author | Jeffrey Wilcke <jeffrey@ethereum.org> | 2015-06-05 01:47:23 +0800 |
---|---|---|
committer | Jeffrey Wilcke <jeffrey@ethereum.org> | 2015-06-05 01:47:23 +0800 |
commit | 45152dead5c6bc144f8ed51ed85d5ef64f783735 (patch) | |
tree | 48aa51432821a0d49ffa6d2a015c16f4867a1c63 /common/natspec | |
parent | 10fc73376789b1b016fbbd86df3b378df0238a0c (diff) | |
parent | 912cf7ba049e4bcd5e497c62bb7cb96e7502f1b9 (diff) | |
download | dexon-45152dead5c6bc144f8ed51ed85d5ef64f783735.tar dexon-45152dead5c6bc144f8ed51ed85d5ef64f783735.tar.gz dexon-45152dead5c6bc144f8ed51ed85d5ef64f783735.tar.bz2 dexon-45152dead5c6bc144f8ed51ed85d5ef64f783735.tar.lz dexon-45152dead5c6bc144f8ed51ed85d5ef64f783735.tar.xz dexon-45152dead5c6bc144f8ed51ed85d5ef64f783735.tar.zst dexon-45152dead5c6bc144f8ed51ed85d5ef64f783735.zip |
Merge pull request #1181 from obscuren/txpool_fixes
cmd: transaction pool fixes and improvements
Diffstat (limited to 'common/natspec')
-rw-r--r-- | common/natspec/natspec_e2e_test.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/common/natspec/natspec_e2e_test.go b/common/natspec/natspec_e2e_test.go index a8d318b57..7e9172649 100644 --- a/common/natspec/natspec_e2e_test.go +++ b/common/natspec/natspec_e2e_test.go @@ -119,7 +119,7 @@ func testEth(t *testing.T) (ethereum *eth.Ethereum, err error) { testAddress := strings.TrimPrefix(testAccount.Address.Hex(), "0x") // set up mock genesis with balance on the testAddress - core.GenesisData = []byte(`{ + core.GenesisAccounts = []byte(`{ "` + testAddress + `": {"balance": "` + testBalance + `"} }`) @@ -181,7 +181,7 @@ func (self *testFrontend) applyTxs() { // end to end test func TestNatspecE2E(t *testing.T) { - // t.Skip() + t.Skip() tf := testInit(t) defer tf.ethereum.Stop() |