From 06d75041434b5183c69bf6b5c89dee3489952a0f Mon Sep 17 00:00:00 2001 From: Esad Akar Date: Fri, 4 Jun 2021 14:26:10 +0300 Subject: [PATCH] review comments --- pkg/localstore/localstore.go | 2 -- pkg/localstore/mode_put_test.go | 20 ++++++++++---------- pkg/localstore/mode_set_test.go | 14 -------------- pkg/postage/listener/listener_test.go | 4 +--- pkg/postage/stamp.go | 2 +- pkg/storage/store.go | 2 ++ 6 files changed, 14 insertions(+), 30 deletions(-) diff --git a/pkg/localstore/localstore.go b/pkg/localstore/localstore.go index f035351ae8b..4db1738ba19 100644 --- 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 index 0f83bf4e62c..2b3e9c8a84f 100644 --- 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 index f177a2db8e3..4fde3b854ac 100644 --- 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 index 009881b0f6f..0f0be487f15 100644 --- 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 index 78ca1dd3eed..9a07f8f06bf 100644 --- 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 index 7c81f4596ff..5be2fd9329d 100644 --- 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