diff options
| author | zelig <viktor.tron@gmail.com> | 2014-06-19 01:12:31 +0800 |
|---|---|---|
| committer | zelig <viktor.tron@gmail.com> | 2014-06-19 01:12:31 +0800 |
| commit | a32a15ad935952537be8c9b4ea9fcb561e5c6125 (patch) | |
| tree | 1fde3dfa00d0e784556ec625ef5b4906607d98aa /ethereum | |
| parent | 50fdfb127ac35120315628a286f0a507c4470a89 (diff) | |
| parent | e517fb5f9da7856c52c771f054166a60e4b8389d (diff) | |
| download | go-tangerine-a32a15ad935952537be8c9b4ea9fcb561e5c6125.tar go-tangerine-a32a15ad935952537be8c9b4ea9fcb561e5c6125.tar.gz go-tangerine-a32a15ad935952537be8c9b4ea9fcb561e5c6125.tar.bz2 go-tangerine-a32a15ad935952537be8c9b4ea9fcb561e5c6125.tar.lz go-tangerine-a32a15ad935952537be8c9b4ea9fcb561e5c6125.tar.xz go-tangerine-a32a15ad935952537be8c9b4ea9fcb561e5c6125.tar.zst go-tangerine-a32a15ad935952537be8c9b4ea9fcb561e5c6125.zip | |
Merge branch 'develop' of github.com:ethereum/go-ethereum into develop
Diffstat (limited to 'ethereum')
| -rw-r--r-- | ethereum/ethereum.go | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/ethereum/ethereum.go b/ethereum/ethereum.go index 179a3f462..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" @@ -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 { |