Merge branch 'master' into testnet

scrtlabs · Oct 9, 2023 · 9f68742 · 9f68742
2 parents 2e414e4 + 8d621e5
commit 9f68742
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/.github/workflows/go-lint.yml b/.github/workflows/go-lint.yml
@@ -25,5 +25,5 @@ jobs:
       - name: golangci-lint
         uses: golangci/golangci-lint-action@v3
         with:
-          version: v1.53.2
+          version: v1.54.2
           skip-cache: true
diff --git a/app/app.go b/app/app.go
@@ -433,9 +433,9 @@ func (app *SecretNetworkApp) setupUpgradeStoreLoaders() {
 		return
 	}
 
-	for _, upgradeDetails := range Upgrades {
-		if upgradeInfo.Name == upgradeDetails.UpgradeName {
-			app.BaseApp.SetStoreLoader(upgradetypes.UpgradeStoreLoader(upgradeInfo.Height, &upgradeDetails.StoreUpgrades))
+	for i := range Upgrades {
+		if upgradeInfo.Name == Upgrades[i].UpgradeName {
+			app.BaseApp.SetStoreLoader(upgradetypes.UpgradeStoreLoader(upgradeInfo.Height, &Upgrades[i].StoreUpgrades))
 		}
 	}
 }

diff --git a/x/compute/internal/keeper/genesis.go b/x/compute/internal/keeper/genesis.go
@@ -24,7 +24,8 @@ func InitGenesis(ctx sdk.Context, keeper Keeper, data types.GenesisState) error
 	}
 
 	var maxContractID int
-	for i, contract := range data.Contracts {
+	for i := range data.Contracts {
+		contract := data.Contracts[i] // This is to prevent golint from complaining about referencing a for variable address
 		err := keeper.importContract(ctx, contract.ContractAddress, contract.ContractCustomInfo, &contract.ContractInfo, contract.ContractState)
 		if err != nil {
 			return sdkerrors.Wrapf(err, "contract number %d", i)