diff options
| author | obscuren <geffobscura@gmail.com> | 2015-06-10 03:12:25 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2015-06-10 03:12:25 +0800 |
| commit | bac9a94ddf20dc530966cbf6cd384aaf94aedc77 (patch) | |
| tree | 0ced967e60315698cc5056a984d7678c417bc1ce /common/natspec | |
| parent | 0e703d92ac9df61e2ededa8c895c70ded101a607 (diff) | |
| parent | 14994fa21bf6f05554ff370d41005d06b68d20a5 (diff) | |
| download | go-tangerine-bac9a94ddf20dc530966cbf6cd384aaf94aedc77.tar go-tangerine-bac9a94ddf20dc530966cbf6cd384aaf94aedc77.tar.gz go-tangerine-bac9a94ddf20dc530966cbf6cd384aaf94aedc77.tar.bz2 go-tangerine-bac9a94ddf20dc530966cbf6cd384aaf94aedc77.tar.lz go-tangerine-bac9a94ddf20dc530966cbf6cd384aaf94aedc77.tar.xz go-tangerine-bac9a94ddf20dc530966cbf6cd384aaf94aedc77.tar.zst go-tangerine-bac9a94ddf20dc530966cbf6cd384aaf94aedc77.zip | |
Merge branch 'release/0.9.28'v0.9.28
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() |