forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-07-26 22:56:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 5096028096 into bbce726c8a

Browse source
This commit is contained in:
Zahoor Mohamed 2017-01-05 10:57:36 +00:00 committed by GitHub
commit 9c9b986abe
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
cmd/swarm/main.go
View file

@ -252,6 +252,10 @@ func registerBzzService(ctx *cli.Context, stack *node.Node) {
if len(bzzport) > 0 { if len(bzzport) > 0 {
bzzconfig.Port = bzzport bzzconfig.Port = bzzport
} }
networkId := ctx.GlobalUint64(SwarmNetworkIdFlag.Name)
if networkId > 0 {
bzzconfig.NetworkId = networkId
}
swapEnabled := ctx.GlobalBool(SwarmSwapEnabled.Name) swapEnabled := ctx.GlobalBool(SwarmSwapEnabled.Name)
syncEnabled := ctx.GlobalBoolT(SwarmSyncEnabled.Name) syncEnabled := ctx.GlobalBoolT(SwarmSyncEnabled.Name)

2
swarm/api/manifest.go
View file

@ -333,7 +333,7 @@ func RegularSlashes(path string) (res string) {
} }
func (self *manifestTrie) getEntry(spath string) (entry *manifestTrieEntry, fullpath string) { func (self *manifestTrie) getEntry(spath string) (entry *manifestTrieEntry, fullpath string) {
path := RegularSlashes(spath) path := RegularSlashes(spath) + "/"
var pos int var pos int
quitC := make(chan bool) quitC := make(chan bool)
entry, pos = self.findPrefixOf(path, quitC) entry, pos = self.findPrefixOf(path, quitC)