resolve merge conflict hell

This commit is contained in:
zelig 2014-12-14 20:57:29 +00:00
parent 4c89d5331f
commit 72290f67fe
4 changed files with 1 additions and 19 deletions

View File

@ -85,13 +85,8 @@ func Init() {
flag.StringVar(&KeyRing, "keyring", "", "identifier for keyring to use") flag.StringVar(&KeyRing, "keyring", "", "identifier for keyring to use")
flag.StringVar(&KeyStore, "keystore", "db", "system to store keyrings: db|file (db)") flag.StringVar(&KeyStore, "keystore", "db", "system to store keyrings: db|file (db)")
flag.StringVar(&OutboundPort, "port", "30303", "listening port") 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(&NatType, "nat", "", "NAT support (UPNP|PMP) (none)")
flag.StringVar(&PMPGateway, "pmp", "", "Gateway IP for PMP") flag.StringVar(&PMPGateway, "pmp", "", "Gateway IP for PMP")
>>>>>>> adapt cmd/cli to new backend
flag.IntVar(&MaxPeer, "maxpeer", 10, "maximum desired peers") flag.IntVar(&MaxPeer, "maxpeer", 10, "maximum desired peers")
flag.IntVar(&RpcPort, "rpcport", 8080, "port to start json-rpc server on") flag.IntVar(&RpcPort, "rpcport", 8080, "port to start json-rpc server on")
flag.BoolVar(&StartRpc, "rpc", false, "start rpc server") flag.BoolVar(&StartRpc, "rpc", false, "start rpc server")

View File

@ -154,22 +154,13 @@ func NatType(natType string, gateway string) (nat p2p.NAT) {
nat = p2p.UPNP() nat = p2p.UPNP()
case "PMP": case "PMP":
ip := net.ParseIP(gateway) ip := net.ParseIP(gateway)
<<<<<<< HEAD
if ip != nil {
clilogger.Fatalf("bad PMP gateway '%s'", gateway)
=======
if ip == nil { if ip == nil {
clilogger.Fatalln("cannot resolve PMP gateway IP %s", gateway) clilogger.Fatalf("cannot resolve PMP gateway IP %s", gateway)
>>>>>>> adapt cmd/cli to new backend
} }
nat = p2p.PMP(ip) nat = p2p.PMP(ip)
case "": case "":
default: default:
<<<<<<< HEAD
clilogger.Fatalf("unrecognised NAT type '%s'", natType) clilogger.Fatalf("unrecognised NAT type '%s'", natType)
=======
clilogger.Fatalln("unrecognised NAT type %s", natType)
>>>>>>> adapt cmd/cli to new backend
} }
return return
} }

View File

@ -137,10 +137,6 @@ func (bc *ChainManager) NewBlock(coinbase []byte) *types.Block {
return 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() { func (bc *ChainManager) Reset() {
AddTestNetFunds(bc.genesisBlock) AddTestNetFunds(bc.genesisBlock)

BIN
ethereum

Binary file not shown.