fixing codeci and upgrade naming (#206)

JackalLabs · Jan 11, 2023 · 13512bf · 13512bf
2 parents a678791 + 11f2bb4
commit 13512bf
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/app/app.go b/app/app.go
@@ -145,7 +145,7 @@ import (
 		notificationsmoduletypes "github.com/jackalLabs/canine-chain/x/notifications/types"
 	*/
 
-	"github.com/jackalLabs/canine-chain/app/upgrades/alpha8"
+	"github.com/jackalLabs/canine-chain/app/upgrades/alpha10"
 	v3 "github.com/jackalLabs/canine-chain/app/upgrades/v3"
 
 	// unnamed import of statik for swagger UI support
@@ -1119,7 +1119,7 @@ func (app *JackalApp) RegisterTendermintService(clientCtx client.Context) {
 func (app *JackalApp) registerUpgradeHandlers() {
 	// app.registerUpgrade(v2.NewUpgrade(app.mm, app.configurator))
 	app.registerUpgrade(v3.NewUpgrade(app.mm, app.configurator, app.OracleKeeper))
-	app.registerUpgrade(alpha8.NewUpgrade(app.mm, app.configurator, app.OracleKeeper))
+	app.registerUpgrade(alpha10.NewUpgrade(app.mm, app.configurator, app.OracleKeeper))
 }
 
 // registerUpgrade registers the given upgrade to be supported by the app

diff --git a/app/upgrades/alpha8/upgrades.go → app/upgrades/alpha10/upgrades.go b/app/upgrades/alpha8/upgrades.go → app/upgrades/alpha10/upgrades.go
@@ -1,4 +1,4 @@
-package alpha8
+package alpha10
 
 import (
 	storetypes "github.com/cosmos/cosmos-sdk/store/types"
@@ -30,7 +30,7 @@ func NewUpgrade(mm *module.Manager, configurator module.Configurator, ok oraclek
 
 // Name implements upgrades.Upgrade
 func (u *Upgrade) Name() string {
-	return "alpha8"
+	return "alpha10"
 }
 
 // Handler implements upgrades.Upgrade

diff --git a/x/storage/keeper/msg_server_cancel_contract.go b/x/storage/keeper/msg_server_cancel_contract.go
@@ -18,7 +18,6 @@ type contract struct {
 }
 
 func CanContract(ctx sdk.Context, root string, creator string, k Keeper) error {
-	var fid string
 	var c contract
 
 	d, dealFound := k.GetActiveDeals(ctx, root)
@@ -46,7 +45,7 @@ func CanContract(ctx sdk.Context, root string, creator string, k Keeper) error {
 	k.RemoveStrays(ctx, c.Cid)
 	k.RemoveActiveDeals(ctx, c.Cid)
 
-	ftc, found := k.GetFidCid(ctx, fid)
+	ftc, found := k.GetFidCid(ctx, c.Fid)
 	if found {
 		var ncids []string
 		err := json.Unmarshal([]byte(ftc.Cids), &ncids)