diff options
author | Péter Szilágyi <peterke@gmail.com> | 2017-01-10 05:53:17 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-01-10 05:53:17 +0800 |
commit | 02b67558e8eaa7b34a28b8dd0223824bbbb52349 (patch) | |
tree | 33bbc5057d4546d93d6d0e92b90eef19b49abb83 /swarm/storage | |
parent | 91c8f87fb128c070b6c557a142e25d4428c96487 (diff) | |
parent | b9b3efb09f9281a5859646d2dcf36b5813132efb (diff) | |
download | dexon-02b67558e8eaa7b34a28b8dd0223824bbbb52349.tar dexon-02b67558e8eaa7b34a28b8dd0223824bbbb52349.tar.gz dexon-02b67558e8eaa7b34a28b8dd0223824bbbb52349.tar.bz2 dexon-02b67558e8eaa7b34a28b8dd0223824bbbb52349.tar.lz dexon-02b67558e8eaa7b34a28b8dd0223824bbbb52349.tar.xz dexon-02b67558e8eaa7b34a28b8dd0223824bbbb52349.tar.zst dexon-02b67558e8eaa7b34a28b8dd0223824bbbb52349.zip |
Merge pull request #3535 from fjl/all-ineffassign
all: fix ineffectual assignments
Diffstat (limited to 'swarm/storage')
-rw-r--r-- | swarm/storage/common_test.go | 2 | ||||
-rw-r--r-- | swarm/storage/dbstore_test.go | 4 | ||||
-rw-r--r-- | swarm/storage/dpa_test.go | 3 |
3 files changed, 4 insertions, 5 deletions
diff --git a/swarm/storage/common_test.go b/swarm/storage/common_test.go index 889b28a70..2a83f471d 100644 --- a/swarm/storage/common_test.go +++ b/swarm/storage/common_test.go @@ -80,7 +80,7 @@ func testStore(m ChunkStore, l int64, branches int64, t *testing.T) { Hash: defaultHash, }) swg := &sync.WaitGroup{} - key, err := chunker.Split(rand.Reader, l, chunkC, swg, nil) + key, _ := chunker.Split(rand.Reader, l, chunkC, swg, nil) swg.Wait() close(chunkC) chunkC = make(chan *Chunk) diff --git a/swarm/storage/dbstore_test.go b/swarm/storage/dbstore_test.go index e2f36a6bc..3d2b5bc36 100644 --- a/swarm/storage/dbstore_test.go +++ b/swarm/storage/dbstore_test.go @@ -144,7 +144,7 @@ func TestDbStoreSyncIterator(t *testing.T) { t.Fatalf("unexpected error creating NewSyncIterator") } - it, err = m.NewSyncIterator(DbSyncState{ + it, _ = m.NewSyncIterator(DbSyncState{ Start: Key(common.Hex2Bytes("1000000000000000000000000000000000000000000000000000000000000000")), Stop: Key(common.Hex2Bytes("4000000000000000000000000000000000000000000000000000000000000000")), First: 2, @@ -168,7 +168,7 @@ func TestDbStoreSyncIterator(t *testing.T) { t.Fatalf("Expected %v chunk, got %v", keys[3], res[1]) } - it, err = m.NewSyncIterator(DbSyncState{ + it, _ = m.NewSyncIterator(DbSyncState{ Start: Key(common.Hex2Bytes("2000000000000000000000000000000000000000000000000000000000000000")), Stop: Key(common.Hex2Bytes("4000000000000000000000000000000000000000000000000000000000000000")), First: 2, diff --git a/swarm/storage/dpa_test.go b/swarm/storage/dpa_test.go index a68232407..a23b9efeb 100644 --- a/swarm/storage/dpa_test.go +++ b/swarm/storage/dpa_test.go @@ -120,8 +120,7 @@ func TestDPA_capacity(t *testing.T) { // check whether it is, indeed, empty dpa.ChunkStore = memStore resultReader = dpa.Retrieve(key) - n, err = resultReader.ReadAt(resultSlice, 0) - if err == nil { + if _, err = resultReader.ReadAt(resultSlice, 0); err == nil { t.Errorf("Was able to read %d bytes from an empty memStore.", len(slice)) } // check how it works with localStore |