diff options
| author | Péter Szilágyi <peterke@gmail.com> | 2016-04-28 17:00:11 +0800 |
|---|---|---|
| committer | Péter Szilágyi <peterke@gmail.com> | 2016-05-02 21:20:21 +0800 |
| commit | 586eddfd09558bfd71f23c2e50c270d2ca665d49 (patch) | |
| tree | 4015e542e0397c606d1f14ef23d15463881be554 /cmd/utils | |
| parent | d46da273c6731512b4114393856a96be06505797 (diff) | |
| download | go-tangerine-586eddfd09558bfd71f23c2e50c270d2ca665d49.tar go-tangerine-586eddfd09558bfd71f23c2e50c270d2ca665d49.tar.gz go-tangerine-586eddfd09558bfd71f23c2e50c270d2ca665d49.tar.bz2 go-tangerine-586eddfd09558bfd71f23c2e50c270d2ca665d49.tar.lz go-tangerine-586eddfd09558bfd71f23c2e50c270d2ca665d49.tar.xz go-tangerine-586eddfd09558bfd71f23c2e50c270d2ca665d49.tar.zst go-tangerine-586eddfd09558bfd71f23c2e50c270d2ca665d49.zip | |
release, all: integrate the release service into geth
Diffstat (limited to 'cmd/utils')
| -rw-r--r-- | cmd/utils/flags.go | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go index 86e9e9b0d..43dbc37f7 100644 --- a/cmd/utils/flags.go +++ b/cmd/utils/flags.go @@ -34,7 +34,6 @@ import ( "github.com/ethereum/ethash" "github.com/ethereum/go-ethereum/accounts" "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/versions" "github.com/ethereum/go-ethereum/core" "github.com/ethereum/go-ethereum/core/state" "github.com/ethereum/go-ethereum/crypto" @@ -49,6 +48,7 @@ import ( "github.com/ethereum/go-ethereum/p2p/nat" "github.com/ethereum/go-ethereum/params" "github.com/ethereum/go-ethereum/pow" + "github.com/ethereum/go-ethereum/release" "github.com/ethereum/go-ethereum/rpc" "github.com/ethereum/go-ethereum/whisper" ) @@ -642,7 +642,7 @@ func MakePasswordList(ctx *cli.Context) []string { // MakeSystemNode sets up a local node, configures the services to launch and // assembles the P2P protocol stack. -func MakeSystemNode(name, version string, extra []byte, ctx *cli.Context) *node.Node { +func MakeSystemNode(name, version string, relconf release.Config, extra []byte, ctx *cli.Context) *node.Node { // Avoid conflicting network flags networks, netFlags := 0, []cli.BoolFlag{DevModeFlag, TestNetFlag, OlympicFlag} for _, flag := range netFlags { @@ -773,12 +773,10 @@ func MakeSystemNode(name, version string, extra []byte, ctx *cli.Context) *node. Fatalf("Failed to register the Whisper service: %v", err) } } - - err = stack.Register(func(ctx *node.ServiceContext) (node.Service, error) { - return versions.NewVersionCheck(ctx) - }) - if err != nil { - Fatalf("Failed to register the Version Check service: %v", err) + if err := stack.Register(func(ctx *node.ServiceContext) (node.Service, error) { + return release.NewReleaseService(ctx, relconf) + }); err != nil { + Fatalf("Failed to register the Geth release oracle service: %v", err) } return stack } |