From 895aadc0264409895fe427a91382d5f9ad77b957 Mon Sep 17 00:00:00 2001
From: Janos Guljas <janos@resenje.org>
Date: Fri, 23 Nov 2018 10:37:39 +0100
Subject: [PATCH] swarm/shed: rename IndexItem.Join to IndexItem.Merge

---
 swarm/shed/index.go | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/swarm/shed/index.go b/swarm/shed/index.go
index ac2bbe8431..daac9bef74 100644
--- a/swarm/shed/index.go
+++ b/swarm/shed/index.go
@@ -39,10 +39,10 @@ type IndexItem struct {
 	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
 // 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 {
 		i.Address = i2.Address
 	}
@@ -133,7 +133,7 @@ func (f Index) Get(keyFields IndexItem) (out IndexItem, err error) {
 	if err != nil {
 		return out, err
 	}
-	return out.Join(keyFields), nil
+	return out.Merge(keyFields), nil
 }
 
 // Put accepts IndexItem to encode information from it
@@ -212,7 +212,7 @@ func (f Index) IterateAll(fn IndexIterFunc) (err error) {
 		if err != nil {
 			return err
 		}
-		stop, err := fn(keyIndexItem.Join(valueIndexItem))
+		stop, err := fn(keyIndexItem.Merge(valueIndexItem))
 		if err != nil {
 			return err
 		}
@@ -246,7 +246,7 @@ func (f Index) IterateFrom(start IndexItem, fn IndexIterFunc) (err error) {
 		if err != nil {
 			return err
 		}
-		stop, err := fn(keyIndexItem.Join(valueIndexItem))
+		stop, err := fn(keyIndexItem.Merge(valueIndexItem))
 		if err != nil {
 			return err
 		}