LaconicNetwork/cosmos-sdk
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

chore: gofumpt (#11839)

Browse Source 
* fumpt using main not master...

* be more descriptive

* fumpt

* fix nits

Co-authored-by: Julien Robert <julien@rbrt.fr>
This commit is contained in:
Jacob Gadikian
2022-05-19 10:55:27 +02:00
committed by GitHub
co-authored by Julien Robert
parent bc2d553f77
commit 55054282d2
412 changed files with 1020 additions and 1059 deletions
Download Patch File Download Diff File Expand all files Collapse all files
store/cachekv/store_test.go
+2 -2
View File
@@ -112,7 +112,7 @@ func TestCacheKVIteratorBounds(t *testing.T) {
// iterate over all of them
itr := st.Iterator(nil, nil)
var i = 0
i := 0
for ; itr.Valid(); itr.Next() {
k, v := itr.Key(), itr.Value()
require.Equal(t, keyFmt(i), k)
@@ -380,7 +380,7 @@ func doRandomOp(t *testing.T, st types.CacheKVStore, truth dbm.DB, maxKey int) {
// iterate over whole domain
func assertIterateDomain(t *testing.T, st types.KVStore, expectedN int) {
itr := st.Iterator(nil, nil)
var i = 0
i := 0
for ; itr.Valid(); itr.Next() {
k, v := itr.Key(), itr.Value()
require.Equal(t, keyFmt(i), k)
store/cachemulti/store.go
-1
View File
@@ -77,7 +77,6 @@ func NewStore(
db dbm.DB, stores map[types.StoreKey]types.CacheWrapper, keys map[string]types.StoreKey,
traceWriter io.Writer, traceContext types.TraceContext, listeners map[types.StoreKey][]types.WriteListener,
) Store {
return NewFromKVStore(dbadapter.Store{DB: db}, stores, keys, traceWriter, traceContext, listeners)
}
store/iavl/store_test.go
+1 -1
View File
@@ -284,7 +284,7 @@ func TestIAVLReverseIterator(t *testing.T) {
iavlStore.Set([]byte{0x00, 0x02}, []byte("0 2"))
iavlStore.Set([]byte{0x01}, []byte("1"))
var testReverseIterator = func(t *testing.T, start []byte, end []byte, expected []string) {
testReverseIterator := func(t *testing.T, start []byte, end []byte, expected []string) {
iter := iavlStore.ReverseIterator(start, end)
var i int
for i = 0; iter.Valid(); iter.Next() {
store/internal/maps/maps_test.go
+2
View File
@@ -12,6 +12,7 @@ func TestEmptyKeyMerkleMap(t *testing.T) {
db := newMerkleMap()
require.Panics(t, func() { db.set("", []byte("value")) }, "setting an empty key should panic")
}
func TestMerkleMap(t *testing.T) {
tests := []struct {
keys []string
@@ -59,6 +60,7 @@ func TestEmptyKeySimpleMap(t *testing.T) {
db := newSimpleMap()
require.Panics(t, func() { db.Set("", []byte("value")) }, "setting an empty key should panic")
}
func TestSimpleMap(t *testing.T) {
tests := []struct {
keys []string
store/listenkv/store_test.go
+5 -4
View File
@@ -29,9 +29,11 @@ var kvPairs = []types.KVPair{
{Key: keyFmt(3), Value: valFmt(3)},
}
var testStoreKey = types.NewKVStoreKey("listen_test")
var interfaceRegistry = codecTypes.NewInterfaceRegistry()
var testMarshaller = codec.NewProtoCodec(interfaceRegistry)
var (
testStoreKey = types.NewKVStoreKey("listen_test")
interfaceRegistry = codecTypes.NewInterfaceRegistry()
testMarshaller = codec.NewProtoCodec(interfaceRegistry)
)
func newListenKVStore(w io.Writer) *listenkv.Store {
store := newEmptyListenKVStore(w)
@@ -130,7 +132,6 @@ func TestListenKVStoreSet(t *testing.T) {
store := newEmptyListenKVStore(&buf)
require.Panics(t, func() { store.Set([]byte(""), []byte("value")) }, "setting an empty key should panic")
require.Panics(t, func() { store.Set(nil, []byte("value")) }, "setting a nil key should panic")
}
func TestListenKVStoreDelete(t *testing.T) {
store/rootmulti/store.go
+1 -2
View File
@@ -202,7 +202,7 @@ func (rs *Store) loadVersion(ver int64, upgrades *types.StoreUpgrades) error {
}
// load each Store (note this doesn't panic on unmounted keys now)
var newStores = make(map[types.StoreKey]types.CommitKVStore)
newStores := make(map[types.StoreKey]types.CommitKVStore)
storesKeys := make([]types.StoreKey, 0, len(rs.storesParams))
@@ -405,7 +405,6 @@ func (rs *Store) Commit() types.CommitID {
// This case means that no commit has been made in the store, we
// start from initialVersion.
version = rs.initialVersion
} else {
// This case can means two things:
// - either there was already a previous commit in the store, in which
store/rootmulti/store_test.go
-1
View File
@@ -316,7 +316,6 @@ func TestParsePath(t *testing.T) {
require.NoError(t, err)
require.Equal(t, substore, "bang")
require.Equal(t, subsubpath, "/baz")
}
func TestMultiStoreRestart(t *testing.T) {
store/streaming/file/service.go
+4 -4
View File
@@ -133,7 +133,7 @@ func (fss *StreamingService) openBeginBlockFile(req abci.RequestBeginBlock) (*os
if fss.filePrefix != "" {
fileName = fmt.Sprintf("%s-%s", fss.filePrefix, fileName)
}
return os.OpenFile(filepath.Join(fss.writeDir, fileName), os.O_CREATE|os.O_WRONLY, 0600)
return os.OpenFile(filepath.Join(fss.writeDir, fileName), os.O_CREATE|os.O_WRONLY, 0o600)
}
// ListenDeliverTx satisfies the baseapp.ABCIListener interface
@@ -183,7 +183,7 @@ func (fss *StreamingService) openDeliverTxFile() (*os.File, error) {
fileName = fmt.Sprintf("%s-%s", fss.filePrefix, fileName)
}
fss.currentTxIndex++
return os.OpenFile(filepath.Join(fss.writeDir, fileName), os.O_CREATE|os.O_WRONLY, 0600)
return os.OpenFile(filepath.Join(fss.writeDir, fileName), os.O_CREATE|os.O_WRONLY, 0o600)
}
// ListenEndBlock satisfies the baseapp.ABCIListener interface
@@ -232,7 +232,7 @@ func (fss *StreamingService) openEndBlockFile() (*os.File, error) {
if fss.filePrefix != "" {
fileName = fmt.Sprintf("%s-%s", fss.filePrefix, fileName)
}
return os.OpenFile(filepath.Join(fss.writeDir, fileName), os.O_CREATE|os.O_WRONLY, 0600)
return os.OpenFile(filepath.Join(fss.writeDir, fileName), os.O_CREATE|os.O_WRONLY, 0o600)
}
// Stream satisfies the baseapp.StreamingService interface
@@ -272,7 +272,7 @@ func (fss *StreamingService) Close() error {
// to dir. It returns nil if dir is writable.
func isDirWriteable(dir string) error {
f := path.Join(dir, ".touch")
if err := ioutil.WriteFile(f, []byte(""), 0600); err != nil {
if err := ioutil.WriteFile(f, []byte(""), 0o600); err != nil {
return err
}
return os.Remove(f)
store/streaming/file/service_test.go
+1 -1
View File
@@ -128,7 +128,7 @@ func TestFileStreamingService(t *testing.T) {
if os.Getenv("CI") != "" {
t.Skip("Skipping TestFileStreamingService in CI environment")
}
err := os.Mkdir(testDir, 0700)
err := os.Mkdir(testDir, 0o700)
require.Nil(t, err)
defer os.RemoveAll(testDir)
store/tools/ics23/smt/create_test.go
+17 -15
View File
@@ -10,21 +10,23 @@ import (
"github.com/cosmos/cosmos-sdk/store/tools/ics23/smt/helpers"
)
var numKeys = 50
var cases = map[string]struct {
size int
loc tmproofs.Where
}{
"tiny left": {size: 10, loc: tmproofs.Left},
"tiny middle": {size: 10, loc: tmproofs.Middle},
"tiny right": {size: 10, loc: tmproofs.Right},
"small left": {size: 100, loc: tmproofs.Left},
"small middle": {size: 100, loc: tmproofs.Middle},
"small right": {size: 100, loc: tmproofs.Right},
"big left": {size: 5431, loc: tmproofs.Left},
"big middle": {size: 5431, loc: tmproofs.Middle},
"big right": {size: 5431, loc: tmproofs.Right},
}
var (
numKeys = 50
cases = map[string]struct {
size int
loc tmproofs.Where
}{
"tiny left": {size: 10, loc: tmproofs.Left},
"tiny middle": {size: 10, loc: tmproofs.Middle},
"tiny right": {size: 10, loc: tmproofs.Right},
"small left": {size: 100, loc: tmproofs.Left},
"small middle": {size: 100, loc: tmproofs.Middle},
"small right": {size: 100, loc: tmproofs.Right},
"big left": {size: 5431, loc: tmproofs.Left},
"big middle": {size: 5431, loc: tmproofs.Middle},
"big right": {size: 5431, loc: tmproofs.Right},
}
)
func TestCreateMembership(t *testing.T) {
for name, tc := range cases {
store/tracekv/store_test.go
-1
View File
@@ -111,7 +111,6 @@ func TestTraceKVStoreSet(t *testing.T) {
store := newEmptyTraceKVStore(&buf)
require.Panics(t, func() { store.Set([]byte(""), []byte("value")) }, "setting an empty key should panic")
require.Panics(t, func() { store.Set(nil, []byte("value")) }, "setting a nil key should panic")
}
func TestTraceKVStoreDelete(t *testing.T) {
store/transient/store.go
+4 -2
View File
@@ -8,8 +8,10 @@ import (
"github.com/cosmos/cosmos-sdk/store/types"
)
var _ types.Committer = (*Store)(nil)
var _ types.KVStore = (*Store)(nil)
var (
_ types.Committer = (*Store)(nil)
_ types.KVStore = (*Store)(nil)
)
// Store is a wrapper for a MemDB with Commiter implementation
type Store struct {
store/types/errors.go
+1 -3
View File
@@ -6,6 +6,4 @@ import (
const StoreCodespace = "store"
var (
ErrInvalidProof = sdkerrors.Register(StoreCodespace, 2, "invalid proof")
)
var ErrInvalidProof = sdkerrors.Register(StoreCodespace, 2, "invalid proof")
store/types/iterator.go
-1
View File
@@ -34,7 +34,6 @@ type PaginatedIterator struct {
page, limit uint // provided during initialization
iterated uint // incremented in a call to Next
}
func (pi *PaginatedIterator) skip() {
store/types/store.go
-1
View File
@@ -92,7 +92,6 @@ func (s *StoreUpgrades) RenamedFrom(key string) string {
}
}
return ""
}
type MultiStore interface {
store/v2alpha1/multi/snapshot.go
+1 -1
View File
@@ -107,7 +107,7 @@ func (rs *Store) Restore(
}
var subStore *substore
var storeSchemaReceived = false
storeSchemaReceived := false
var snapshotItem snapshottypes.SnapshotItem
store/v2alpha1/multi/store.go
+2
View File
@@ -892,9 +892,11 @@ func (tlm *traceListenMixin) ListeningEnabled(key types.StoreKey) bool {
func (tlm *traceListenMixin) TracingEnabled() bool {
return tlm.TraceWriter != nil
}
func (tlm *traceListenMixin) SetTracer(w io.Writer) {
tlm.TraceWriter = w
}
func (tlm *traceListenMixin) SetTraceContext(tc types.TraceContext) {
tlm.TraceContext = tc
}
store/v2alpha1/multi/store_test.go
+5 -4
View File
@@ -163,7 +163,7 @@ func TestIterators(t *testing.T) {
string([]byte{0x01}): "1",
})
var testCase = func(t *testing.T, iter types.Iterator, expected []string) {
testCase := func(t *testing.T, iter types.Iterator, expected []string) {
var i int
for i = 0; iter.Valid(); iter.Next() {
expectedValue := expected[i]
@@ -260,7 +260,8 @@ func TestCommit(t *testing.T) {
testFailedCommit := func(t *testing.T,
store *Store,
db dbm.DBConnection,
opts StoreConfig) {
opts StoreConfig,
) {
if db == nil {
db = store.stateDB
}
@@ -936,8 +937,8 @@ func TestListeners(t *testing.T) {
},
}
var interfaceRegistry = codecTypes.NewInterfaceRegistry()
var marshaller = codec.NewProtoCodec(interfaceRegistry)
interfaceRegistry := codecTypes.NewInterfaceRegistry()
marshaller := codec.NewProtoCodec(interfaceRegistry)
db := memdb.NewDB()
opts := simpleStoreConfig(t)
store/v2alpha1/multi/test_util.go
+24 -15
View File
@@ -7,25 +7,30 @@ import (
dbm "github.com/cosmos/cosmos-sdk/db"
)
type dbDeleteVersionFails struct{ dbm.DBConnection }
type dbRWCommitFails struct{ dbm.DBConnection }
type dbRWCrudFails struct{ dbm.DBConnection }
type dbSaveVersionFails struct{ dbm.DBConnection }
type dbRevertFails struct {
dbm.DBConnection
// order of calls to fail on (eg. [1, 0] => first call fails; second succeeds)
failOn []bool
}
type (
dbDeleteVersionFails struct{ dbm.DBConnection }
dbRWCommitFails struct{ dbm.DBConnection }
dbRWCrudFails struct{ dbm.DBConnection }
dbSaveVersionFails struct{ dbm.DBConnection }
dbRevertFails struct {
dbm.DBConnection
// order of calls to fail on (eg. [1, 0] => first call fails; second succeeds)
failOn []bool
}
)
type dbVersionsIs struct {
dbm.DBConnection
vset dbm.VersionSet
}
type dbVersionsFails struct{ dbm.DBConnection }
type rwCommitFails struct{ dbm.DBReadWriter }
type rwCrudFails struct {
dbm.DBReadWriter
onKey []byte
}
type (
dbVersionsFails struct{ dbm.DBConnection }
rwCommitFails struct{ dbm.DBReadWriter }
rwCrudFails struct {
dbm.DBReadWriter
onKey []byte
}
)
func (dbVersionsFails) Versions() (dbm.VersionSet, error) { return nil, errors.New("dbVersionsFails") }
func (db dbVersionsIs) Versions() (dbm.VersionSet, error) { return db.vset, nil }
@@ -48,6 +53,7 @@ func (tx rwCommitFails) Commit() error {
tx.Discard()
return errors.New("rwCommitFails")
}
func (db dbRWCommitFails) ReadWriter() dbm.DBReadWriter {
return rwCommitFails{db.DBConnection.ReadWriter()}
}
@@ -58,18 +64,21 @@ func (rw rwCrudFails) Get(k []byte) ([]byte, error) {
}
return rw.DBReadWriter.Get(k)
}
func (rw rwCrudFails) Has(k []byte) (bool, error) {
if rw.onKey == nil || bytes.Equal(rw.onKey, k) {
return false, errors.New("rwCrudFails.Has")
}
return rw.DBReadWriter.Has(k)
}
func (rw rwCrudFails) Set(k []byte, v []byte) error {
if rw.onKey == nil || bytes.Equal(rw.onKey, k) {
return errors.New("rwCrudFails.Set")
}
return rw.DBReadWriter.Set(k, v)
}
func (rw rwCrudFails) Delete(k []byte) error {
if rw.onKey == nil || bytes.Equal(rw.onKey, k) {
return errors.New("rwCrudFails.Delete")
store/v2alpha1/smt/proof_test.go
+1 -1
View File
@@ -55,7 +55,7 @@ func TestProofOpInterface(t *testing.T) {
assert.Equal(t, key, tmProofOp.Key, key)
assert.NotEmpty(t, tmProofOp.Data)
//decode
// decode
decoded, err := smtstore.ProofDecoder(tmProofOp)
assert.NoError(t, err)
assert.NotNil(t, decoded)