diff options
| author | Janos Guljas <janos@resenje.org> | 2017-12-14 17:35:49 +0800 |
|---|---|---|
| committer | Janos Guljas <janos@resenje.org> | 2017-12-14 17:36:12 +0800 |
| commit | 47a801455966298d1d1519eebb955024c8f02b84 (patch) | |
| tree | 5b8144ba4844092dc0bae599fc3314eaacf1a7b4 /bmt/bmt.go | |
| parent | 19982f946735948478b6b7e7706f1b615f171d0d (diff) | |
| parent | 3654aeaa4f87452ac5bc801a18808189595e2ef8 (diff) | |
| download | dexon-47a801455966298d1d1519eebb955024c8f02b84.tar.gz dexon-47a801455966298d1d1519eebb955024c8f02b84.tar.zst dexon-47a801455966298d1d1519eebb955024c8f02b84.zip | |
cmd/swarm: Merge branch 'master' into multiple-ens-endpoints
Fix a conflict in cmd/swarm envVarsOverride function.
Diffstat (limited to 'bmt/bmt.go')
| -rw-r--r-- | bmt/bmt.go | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/bmt/bmt.go b/bmt/bmt.go index d62365bb1..4b65b1d94 100644 --- a/bmt/bmt.go +++ b/bmt/bmt.go @@ -260,8 +260,7 @@ func NewTree(hasher BaseHasher, segmentSize, segmentCount int) *Tree { for d := 1; d <= depth(segmentCount); d++ { nodes := make([]*Node, count) for i := 0; i < len(nodes); i++ { - var parent *Node - parent = prevlevel[i/2] + parent := prevlevel[i/2] t := NewNode(level, i, parent) nodes[i] = t } |