review comments

ethersphere · Jun 4, 2021 · 06d7504 · 06d7504
1 parent 62502f9
commit 06d7504
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 30 deletions.
diff --git a/pkg/localstore/localstore.go b/pkg/localstore/localstore.go
@@ -408,7 +408,6 @@ func New(path string, baseKey []byte, o *Options, logger logging.Logger) (db *DB
 			return value, nil
 		},
 		DecodeValue: func(keyItem shed.Item, value []byte) (e shed.Item, err error) {
-			e = keyItem
 			e.BatchID = make([]byte, 32)
 			copy(e.BatchID, value[:32])
 			e.Index = make([]byte, postage.IndexSize)
@@ -508,7 +507,6 @@ func New(path string, baseKey []byte, o *Options, logger logging.Logger) (db *DB
 			return value, nil
 		},
 		DecodeValue: func(keyItem shed.Item, value []byte) (e shed.Item, err error) {
-			e = keyItem
 			e.Address = value[:32]
 			e.Timestamp = value[32:]
 			return e, nil

diff --git a/pkg/localstore/mode_put_test.go b/pkg/localstore/mode_put_test.go
@@ -491,10 +491,8 @@ func TestModePut_SameStamp(t *testing.T) {
 	stamp := postagetesting.MustNewStamp()
 	ts := time.Now().Unix()
 
-	modes := []storage.ModePut{storage.ModePutRequest, storage.ModePutRequestPin, storage.ModePutSync, storage.ModePutUpload, storage.ModePutUploadPin}
-
-	for _, modeTc1 := range modes {
-		for _, modeTc2 := range modes {
+	for _, modeTc1 := range storage.PutModes {
+		for _, modeTc2 := range storage.PutModes {
 			for _, tc := range []struct {
 				persistChunk swarm.Chunk
 				discardChunk swarm.Chunk
@@ -530,7 +528,9 @@ func TestModePut_SameStamp(t *testing.T) {
 					newItemsCountTest(db.postageChunksIndex, 1)(t)
 					newItemsCountTest(db.postageRadiusIndex, 1)(t)
 					newItemsCountTest(db.postageIndexIndex, 1)(t)
-					newItemsCountTest(db.pullIndex, 1)(t)
+					if modeTc1 != storage.ModePutRequestCache {
+						newItemsCountTest(db.pullIndex, 1)(t)
+					}
 
 					_, err = db.Get(ctx, storage.ModeGetLookup, tc.persistChunk.Address())
 					if err != nil {
@@ -552,10 +552,8 @@ func TestModePut_ImmutableStamp(t *testing.T) {
 	stamp := postagetesting.MustNewStamp()
 	ts := time.Now().Unix()
 
-	modes := []storage.ModePut{storage.ModePutRequest, storage.ModePutRequestPin, storage.ModePutSync, storage.ModePutUpload, storage.ModePutUploadPin}
-
-	for _, modeTc1 := range modes {
-		for _, modeTc2 := range modes {
+	for _, modeTc1 := range storage.PutModes {
+		for _, modeTc2 := range storage.PutModes {
 			for _, tc := range []struct {
 				name         string
 				persistChunk swarm.Chunk
@@ -596,7 +594,9 @@ func TestModePut_ImmutableStamp(t *testing.T) {
 					newItemsCountTest(db.postageChunksIndex, 1)(t)
 					newItemsCountTest(db.postageRadiusIndex, 1)(t)
 					newItemsCountTest(db.postageIndexIndex, 1)(t)
-					newItemsCountTest(db.pullIndex, 1)(t)
+					if modeTc1 != storage.ModePutRequestCache {
+						newItemsCountTest(db.pullIndex, 1)(t)
+					}
 
 					_, err = db.Get(ctx, storage.ModeGetLookup, tc.persistChunk.Address())
 					if err != nil {

diff --git a/pkg/localstore/mode_set_test.go b/pkg/localstore/mode_set_test.go
@@ -108,22 +108,8 @@ func TestModeSetRemove_WithSync(t *testing.T) {
 			}
 
 			t.Run("retrieve indexes", func(t *testing.T) {
-				for _, ch := range chs {
-					wantErr := leveldb.ErrNotFound
-					_, err := db.retrievalDataIndex.Get(addressToItem(ch.Address()))
-					if !errors.Is(err, wantErr) {
-						t.Errorf("got error %v, want %v", err, wantErr)
-					}
-
-					// access index should not be set
-					_, err = db.retrievalAccessIndex.Get(addressToItem(ch.Address()))
-					if !errors.Is(err, wantErr) {
-						t.Errorf("got error %v, want %v", err, wantErr)
-					}
-				}
 
 				t.Run("retrieve data index count", newItemsCountTest(db.retrievalDataIndex, 0))
-
 				t.Run("retrieve access index count", newItemsCountTest(db.retrievalAccessIndex, 0))
 			})
 

diff --git a/pkg/postage/listener/listener_test.go b/pkg/postage/listener/listener_test.go
@@ -38,9 +38,7 @@ func TestListener(t *testing.T) {
 			owner:            addr[:],
 			amount:           big.NewInt(42),
 			normalisedAmount: big.NewInt(43),
-			// bucketDepth:      10,
-			depth: 100,
-			// immutable:        true,
+			depth:            100,
 		}
 
 		ev, evC := newEventUpdaterMock()

diff --git a/pkg/postage/stamp.go b/pkg/postage/stamp.go
@@ -68,7 +68,7 @@ func (s *Stamp) Timestamp() []byte {
 }
 
 // MarshalBinary gives the byte slice serialisation of a stamp:
-// batchID[32]|index[32]|SignatureUser[65]|SignatureOwner[65].
+// batchID[32]|index[8]|Signature[65].
 func (s *Stamp) MarshalBinary() ([]byte, error) {
 	buf := make([]byte, StampSize)
 	copy(buf, s.batchID)

diff --git a/pkg/storage/store.go b/pkg/storage/store.go
@@ -56,6 +56,8 @@ const (
 	ModeGetRequestPin
 )
 
+var PutModes = []ModePut{ModePutRequest, ModePutRequestPin, ModePutSync, ModePutUpload, ModePutUploadPin, ModePutRequestCache}
+
 // ModePut enumerates different Putter modes.
 type ModePut int