diff options
| author | obscuren <geffobscura@gmail.com> | 2015-03-11 08:08:42 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2015-03-11 08:08:42 +0800 |
| commit | 7e0ccc9de53e788ddc1879248bceb33a9ccdbae0 (patch) | |
| tree | 816ff2e06aaa78721a22eee7f2c8493fbf313fb4 /cmd/evm/main.go | |
| parent | ce595b9266d658a5eae626d78aec7f47c04222ca (diff) | |
| parent | eba4f389a6c494bc3e15b3bbc6516b51a5e61236 (diff) | |
| download | dexon-7e0ccc9de53e788ddc1879248bceb33a9ccdbae0.tar dexon-7e0ccc9de53e788ddc1879248bceb33a9ccdbae0.tar.gz dexon-7e0ccc9de53e788ddc1879248bceb33a9ccdbae0.tar.bz2 dexon-7e0ccc9de53e788ddc1879248bceb33a9ccdbae0.tar.lz dexon-7e0ccc9de53e788ddc1879248bceb33a9ccdbae0.tar.xz dexon-7e0ccc9de53e788ddc1879248bceb33a9ccdbae0.tar.zst dexon-7e0ccc9de53e788ddc1879248bceb33a9ccdbae0.zip | |
Merge branch 'develop' into rpcfrontier
Conflicts:
rpc/api.go
rpc/args.go
Diffstat (limited to 'cmd/evm/main.go')
| -rw-r--r-- | cmd/evm/main.go | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/cmd/evm/main.go b/cmd/evm/main.go index d6a93460e..960558bb4 100644 --- a/cmd/evm/main.go +++ b/cmd/evm/main.go @@ -59,8 +59,6 @@ func main() { logger.AddLogSystem(logger.NewStdLogSystem(os.Stdout, log.LstdFlags, logger.LogLevel(*loglevel))) - ethutil.ReadConfig("/tmp/evmtest", "/tmp/evm", "") - db, _ := ethdb.NewMemDatabase() statedb := state.New(nil, db) sender := statedb.NewStateObject([]byte("sender")) |