forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-19 18:32:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

swarm/shed: rename IndexItem.Join to IndexItem.Merge

Browse source
This commit is contained in:
Janos Guljas 2018-11-23 10:37:39 +01:00
parent aadd1d2f65
commit 895aadc026
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
swarm/shed/index.go
View file

@ -39,10 +39,10 @@ type IndexItem struct {
StoreTimestamp int64 StoreTimestamp int64
} }
// Join is a helper method to construct a new // Merge is a helper method to construct a new
// IndexItem by filling up fields with default values // IndexItem by filling up fields with default values
// of a particular IndexItem with values from another one. // of a particular IndexItem with values from another one.
func (i IndexItem) Join(i2 IndexItem) (new IndexItem) { func (i IndexItem) Merge(i2 IndexItem) (new IndexItem) {
if i.Address == nil { if i.Address == nil {
i.Address = i2.Address i.Address = i2.Address
} }
@ -133,7 +133,7 @@ func (f Index) Get(keyFields IndexItem) (out IndexItem, err error) {
if err != nil { if err != nil {
return out, err return out, err
} }
return out.Join(keyFields), nil return out.Merge(keyFields), nil
} }
// Put accepts IndexItem to encode information from it // Put accepts IndexItem to encode information from it
@ -212,7 +212,7 @@ func (f Index) IterateAll(fn IndexIterFunc) (err error) {
if err != nil { if err != nil {
return err return err
} }
stop, err := fn(keyIndexItem.Join(valueIndexItem)) stop, err := fn(keyIndexItem.Merge(valueIndexItem))
if err != nil { if err != nil {
return err return err
} }
@ -246,7 +246,7 @@ func (f Index) IterateFrom(start IndexItem, fn IndexIterFunc) (err error) {
if err != nil { if err != nil {
return err return err
} }
stop, err := fn(keyIndexItem.Join(valueIndexItem)) stop, err := fn(keyIndexItem.Merge(valueIndexItem))
if err != nil { if err != nil {
return err return err
} }