diff options
| -rw-r--r-- | cmd/ethereum/flags.go | 5 | ||||
| -rw-r--r-- | cmd/utils/cmd.go | 11 | ||||
| -rw-r--r-- | core/chain_manager.go | 4 | ||||
| -rwxr-xr-x | ethereum | bin | 16025932 -> 0 bytes |
4 files changed, 1 insertions, 19 deletions
diff --git a/cmd/ethereum/flags.go b/cmd/ethereum/flags.go index e709ecf50..556735491 100644 --- a/cmd/ethereum/flags.go +++ b/cmd/ethereum/flags.go @@ -85,13 +85,8 @@ func Init() { flag.StringVar(&KeyRing, "keyring", "", "identifier for keyring to use") flag.StringVar(&KeyStore, "keystore", "db", "system to store keyrings: db|file (db)") flag.StringVar(&OutboundPort, "port", "30303", "listening port") -<<<<<<< HEAD - flag.StringVar(&NatType, "nat", "", "nat support (UPNP|PMP)") - flag.StringVar(&PMPGateway, "gateway", "", "PMP gateway IP") -======= flag.StringVar(&NatType, "nat", "", "NAT support (UPNP|PMP) (none)") flag.StringVar(&PMPGateway, "pmp", "", "Gateway IP for PMP") ->>>>>>> adapt cmd/cli to new backend flag.IntVar(&MaxPeer, "maxpeer", 10, "maximum desired peers") flag.IntVar(&RpcPort, "rpcport", 8080, "port to start json-rpc server on") flag.BoolVar(&StartRpc, "rpc", false, "start rpc server") diff --git a/cmd/utils/cmd.go b/cmd/utils/cmd.go index 867ef5e37..3e3ac617a 100644 --- a/cmd/utils/cmd.go +++ b/cmd/utils/cmd.go @@ -154,22 +154,13 @@ func NatType(natType string, gateway string) (nat p2p.NAT) { nat = p2p.UPNP() case "PMP": ip := net.ParseIP(gateway) -<<<<<<< HEAD - if ip != nil { - clilogger.Fatalf("bad PMP gateway '%s'", gateway) -======= if ip == nil { - clilogger.Fatalln("cannot resolve PMP gateway IP %s", gateway) ->>>>>>> adapt cmd/cli to new backend + clilogger.Fatalf("cannot resolve PMP gateway IP %s", gateway) } nat = p2p.PMP(ip) case "": default: -<<<<<<< HEAD clilogger.Fatalf("unrecognised NAT type '%s'", natType) -======= - clilogger.Fatalln("unrecognised NAT type %s", natType) ->>>>>>> adapt cmd/cli to new backend } return } diff --git a/core/chain_manager.go b/core/chain_manager.go index 9ed2c1c42..f9fb3b3f8 100644 --- a/core/chain_manager.go +++ b/core/chain_manager.go @@ -137,10 +137,6 @@ func (bc *ChainManager) NewBlock(coinbase []byte) *types.Block { return block } -func (self *ChainManager) Status() (td *big.Int, currentBlock []byte, genesisBlock []byte) { - return self.TD, self.CurrentBlock.Hash(), self.Genesis().Hash() -} - func (bc *ChainManager) Reset() { AddTestNetFunds(bc.genesisBlock) diff --git a/ethereum b/ethereum Binary files differdeleted file mode 100755 index 7e17d95a4..000000000 --- a/ethereum +++ /dev/null |