forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-14 07:53:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

swarm, cmd/swarm: PR cleanup, rm obsolete flags

Browse source
This commit is contained in:
lash 2017-06-23 06:51:30 +02:00
parent 8f141465f2
commit 7ab9a617eb
2 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cmd/swarm/main.go
View file

@ -265,9 +265,7 @@ Cleans database of corrupted entries.
SwarmUpFromStdinFlag, SwarmUpFromStdinFlag,
SwarmUploadMimeType, SwarmUploadMimeType,
// pss flags // pss flags
PssHostFlag,
PssEnabledFlag, PssEnabledFlag,
PssPortFlag,
} }
app.Flags = append(app.Flags, debug.Flags...) app.Flags = append(app.Flags, debug.Flags...)
app.Before = func(ctx *cli.Context) error { app.Before = func(ctx *cli.Context) error {

10
swarm/swarm.go
View file

@ -28,7 +28,6 @@ import (
"github.com/ethereum/go-ethereum/contracts/chequebook" "github.com/ethereum/go-ethereum/contracts/chequebook"
"github.com/ethereum/go-ethereum/contracts/ens" "github.com/ethereum/go-ethereum/contracts/ens"
"github.com/ethereum/go-ethereum/crypto" "github.com/ethereum/go-ethereum/crypto"
"github.com/ethereum/go-ethereum/p2p/discover"
"github.com/ethereum/go-ethereum/ethclient" "github.com/ethereum/go-ethereum/ethclient"
"github.com/ethereum/go-ethereum/log" "github.com/ethereum/go-ethereum/log"
"github.com/ethereum/go-ethereum/node" "github.com/ethereum/go-ethereum/node"
@ -41,7 +40,6 @@ import (
"github.com/ethereum/go-ethereum/swarm/network" "github.com/ethereum/go-ethereum/swarm/network"
"github.com/ethereum/go-ethereum/swarm/pss" "github.com/ethereum/go-ethereum/swarm/pss"
"github.com/ethereum/go-ethereum/swarm/storage" "github.com/ethereum/go-ethereum/swarm/storage"
//psschat "github.com/ethereum/go-ethereum/swarm/pss/protocols/chat"
) )
// the swarm stack // the swarm stack
@ -241,9 +239,9 @@ func (self *Swarm) Start(net *p2p.Server) error {
func (self *Swarm) Stop() error { func (self *Swarm) Stop() error {
self.dpa.Stop() self.dpa.Stop()
self.bzz.Stop() self.bzz.Stop()
//if self.pss != nil { if self.pss != nil {
// self.pss.Stop() self.pss.Stop()
//} }
if ch := self.config.Swap.Chequebook(); ch != nil { if ch := self.config.Swap.Chequebook(); ch != nil {
ch.Stop() ch.Stop()
ch.Save() ch.Save()
@ -356,7 +354,7 @@ func NewLocalSwarm(datadir, port string) (self *Swarm, err error) {
return return
} }
config, err := api.NewConfig(datadir, common.Address{}, prvKey, network.NetworkId) config, err := api.NewConfig(datadir, common.Address{}, prvKey, network.NetworkID)
if err != nil { if err != nil {
return return
} }