diff --git a/store/cachekv/internal/mergeiterator.go b/store/cachekv/internal/mergeiterator.go index e4d80ab491..58e9497b30 100644 --- a/store/cachekv/internal/mergeiterator.go +++ b/store/cachekv/internal/mergeiterator.go @@ -24,7 +24,7 @@ type cacheMergeIterator struct { var _ types.Iterator = (*cacheMergeIterator)(nil) -func NewCacheMergeIterator(parent, cache types.Iterator, ascending bool) *cacheMergeIterator { //nolint:revive +func NewCacheMergeIterator(parent, cache types.Iterator, ascending bool) types.Iterator { iter := &cacheMergeIterator{ parent: parent, cache: cache, diff --git a/store/iavl/tree_test.go b/store/iavl/tree_test.go index fa04129616..c03e9518c7 100644 --- a/store/iavl/tree_test.go +++ b/store/iavl/tree_test.go @@ -14,8 +14,8 @@ func TestImmutableTreePanics(t *testing.T) { it := &immutableTree{immTree} require.Panics(t, func() { it.Set([]byte{}, []byte{}) }) require.Panics(t, func() { it.Remove([]byte{}) }) - require.Panics(t, func() { it.SaveVersion() }) //nolint:errcheck - require.Panics(t, func() { it.DeleteVersion(int64(1)) }) //nolint:errcheck + require.Panics(t, func() { _, _, _ = it.SaveVersion() }) + require.Panics(t, func() { _ = it.DeleteVersion(int64(1)) }) imm, err := it.GetImmutable(1) require.Error(t, err) diff --git a/store/internal/conv/string_test.go b/store/internal/conv/string_test.go index 7029e3190a..3a14517531 100644 --- a/store/internal/conv/string_test.go +++ b/store/internal/conv/string_test.go @@ -26,7 +26,7 @@ func (s *StringSuite) TestUnsafeStrToBytes() { b := unsafeConvertStr() runtime.GC() <-time.NewTimer(2 * time.Millisecond).C - b2 := append(b, 'd') + b2 := append(b, 'd') s.Equal("abc", string(b)) s.Equal("abcd", string(b2)) } diff --git a/store/mem/store.go b/store/mem/store.go index ce83089f70..ca832d7b77 100644 --- a/store/mem/store.go +++ b/store/mem/store.go @@ -27,7 +27,7 @@ func NewStore() *Store { return NewStoreWithDB(dbm.NewMemDB()) } -func NewStoreWithDB(db *dbm.MemDB) *Store { //nolint: interfacer +func NewStoreWithDB(db *dbm.MemDB) *Store { //nolint: interfacer // Concrete return type is fine here. return &Store{Store: dbadapter.Store{DB: db}} } diff --git a/store/rootmulti/store.go b/store/rootmulti/store.go index a47a9beaee..55ee77e394 100644 --- a/store/rootmulti/store.go +++ b/store/rootmulti/store.go @@ -827,7 +827,6 @@ func (rs *Store) Snapshot(height uint64, protoWriter protoio.Writer) error { node, err := exporter.Next() if err == iavltree.ErrorExportDone { rs.logger.Debug("snapshot Done", "store", store.name, "nodeCount", nodeCount) - nodeCount = 0 break } else if err != nil { return err diff --git a/store/types/store_test.go b/store/types/store_test.go index 0a46f84fc9..b6304d131b 100644 --- a/store/types/store_test.go +++ b/store/types/store_test.go @@ -233,8 +233,6 @@ func TestNewTransientStoreKeys(t *testing.T) { func TestNewInfiniteGasMeter(t *testing.T) { gm := NewInfiniteGasMeter() require.NotNil(t, gm) - _, ok := gm.(GasMeter) //nolint:gosimple - require.True(t, ok) } func TestStoreTypes(t *testing.T) {