diff options
| author | obscuren <geffobscura@gmail.com> | 2014-06-17 00:24:57 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2014-06-17 00:24:57 +0800 |
| commit | 98335d2040bbd2b18a238b4ffa47e50507fffb31 (patch) | |
| tree | 1fde3dfa00d0e784556ec625ef5b4906607d98aa /ethereum/ethereum.go | |
| parent | aa8a86f0a61286b3d0709316215ce6e9d3833f25 (diff) | |
| parent | c1220e87293e440f842095c5a601515c0c8f5cb0 (diff) | |
| download | go-tangerine-98335d2040bbd2b18a238b4ffa47e50507fffb31.tar go-tangerine-98335d2040bbd2b18a238b4ffa47e50507fffb31.tar.gz go-tangerine-98335d2040bbd2b18a238b4ffa47e50507fffb31.tar.bz2 go-tangerine-98335d2040bbd2b18a238b4ffa47e50507fffb31.tar.lz go-tangerine-98335d2040bbd2b18a238b4ffa47e50507fffb31.tar.xz go-tangerine-98335d2040bbd2b18a238b4ffa47e50507fffb31.tar.zst go-tangerine-98335d2040bbd2b18a238b4ffa47e50507fffb31.zip | |
Merge branch 'release/0.5.13'0.5.13
Diffstat (limited to 'ethereum/ethereum.go')
| -rw-r--r-- | ethereum/ethereum.go | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/ethereum/ethereum.go b/ethereum/ethereum.go index 56ea46122..8812e0a60 100644 --- a/ethereum/ethereum.go +++ b/ethereum/ethereum.go @@ -3,7 +3,6 @@ package main import ( "fmt" "github.com/ethereum/eth-go" - "github.com/ethereum/eth-go/ethchain" "github.com/ethereum/eth-go/ethutil" "github.com/ethereum/go-ethereum/utils" "github.com/rakyll/globalconf" @@ -62,14 +61,14 @@ func main() { } g, err := globalconf.NewWithOptions(&globalconf.Options{ - Filename: path.Join(ethutil.ApplicationFolder(".ethereum"), "conf.ini"), + Filename: path.Join(ethutil.ApplicationFolder(Datadir), "conf.ini"), }) if err != nil { fmt.Println(err) } else { g.ParseAll() } - ethutil.ReadConfig(".ethereum", lt, g, Identifier) + ethutil.ReadConfig(Datadir, lt, g, Identifier) logger := ethutil.Config.Log @@ -86,8 +85,6 @@ func main() { logSys = log.New(os.Stdout, "", flags) } - ethchain.InitFees() - // Instantiated a eth stack ethereum, err := eth.New(eth.CapDefault, UseUPnP) if err != nil { |