cosmos · mergify · Jun 8, 2021 · Jun 5, 2021 · Jun 5, 2021 · Jun 7, 2021
diff --git a/.golangci.yml b/.golangci.yml
@@ -1,7 +1,7 @@
 run:
   tests: false
-#   # timeout for analysis, e.g. 30s, 5m, default is 1m
-#   timeout: 5m
+  # timeout for analysis, e.g. 30s, 5m, default is 1m
+  timeout: 5m
 
 linters:
   disable-all: true

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -36,6 +36,7 @@ Ref: https://keepachangelog.com/en/1.0.0/
 
 ## [Unreleased]
 
+* [\#9460](https://github.com/cosmos/cosmos-sdk/pull/9460) Fix lint error in `MigratePrefixAddress`.
 * [\#9428](https://github.com/cosmos/cosmos-sdk/pull/9428) Optimize bank InitGenesis. Removed bank keeper's `k.setBalances` and `k.clearBalances`. Added `k.initBalances`.
 * [\#9231](https://github.com/cosmos/cosmos-sdk/pull/9231) Remove redundant staking errors.
 * [\#9205](https://github.com/cosmos/cosmos-sdk/pull/9205) Improve readability in `abci` handleQueryP2P

diff --git a/client/docs/statik/statik.go b/client/docs/statik/statik.go
diff --git a/docs/DOC_WRITING_GUIDELINES.md b/docs/DOC_WRITING_GUIDELINES.md
@@ -9,8 +9,6 @@
 + Follow Google developer documentation [style guide](https://developers.google.com/style).
 + Check the meaning of words in Microsoft's [A-Z word list and term collections](https://docs.microsoft.com/en-us/style-guide/a-z-word-list-term-collections/term-collections/accessibility-terms) (use the search input!).
 
-
-
 ## Technical Writing Course
 
 Google provides a free [course](https://developers.google.com/tech-writing/overview) for technical writing.
diff --git a/docs/core/encoding.md b/docs/core/encoding.md
@@ -198,7 +198,7 @@ The above `Profile` example is a fictive example used for educational purposes.
 - the `AccountI` interface for encodinig different types of accounts (similar to the above example) in the x/auth query responses,
 - the `Evidencei` interface for encoding different types of evidences in the x/evidence module,
 - the `AuthorizationI` interface for encoding different types of x/authz authorizations,
-- the [`Validator`](https://github.com/cosmos/cosmos-sdk/blob/v0.42.5/x/staking/types/staking.pb.go#L306-L337) struct that contains information about a validator. 
+- the [`Validator`](https://github.com/cosmos/cosmos-sdk/blob/v0.42.5/x/staking/types/staking.pb.go#L306-L337) struct that contains information about a validator.
 
 A real-life example of encoding the pubkey as `Any` inside the Validator struct in x/staking is shown in the following example:
 

diff --git a/server/rosetta/lib/errors/errors_test.go b/server/rosetta/lib/errors/errors_test.go
@@ -65,4 +65,4 @@ func (e *MyError) Error() string {
 }
 func (e *MyError) Is(err error) bool {
 	return true
-}
+}
diff --git a/x/distribution/legacy/v043/helpers.go b/x/distribution/legacy/v043/helpers.go
@@ -19,7 +19,8 @@ func MigratePrefixAddress(store sdk.KVStore, prefixBz []byte) {
 
 	for ; oldStoreIter.Valid(); oldStoreIter.Next() {
 		addr := oldStoreIter.Key()
-		newStoreKey := append(prefixBz, address.MustLengthPrefix(addr)...)
+		var newStoreKey []byte = prefixBz
+		newStoreKey = append(newStoreKey, address.MustLengthPrefix(addr)...)
 
 		// Set new key on store. Values don't change.
 		store.Set(newStoreKey, oldStoreIter.Value())
-Original file line number
+Diff line change
@@ Expand Up / @@ -65,4 +65,4 @@ func (e *MyError) Error() string { @@
     }
     func (e *MyError) Is(err error) bool {
     	return true
-    }
+    }