From 91413b15a92a9f69aa13b8c770305d5130311841 Mon Sep 17 00:00:00 2001 From: Youngtaek Yoon Date: Tue, 11 Apr 2023 09:03:20 +0900 Subject: [PATCH 1/6] Do not loop enum --- x/collection/keeper/supply.go | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/x/collection/keeper/supply.go b/x/collection/keeper/supply.go index bc7f9f8a62..0e5841b3bb 100644 --- a/x/collection/keeper/supply.go +++ b/x/collection/keeper/supply.go @@ -26,15 +26,12 @@ func (k Keeper) CreateContract(ctx sdk.Context, creator sdk.AccAddress, contract Grantee: creator.String(), } ctx.EventManager().EmitEvent(collection.NewEventGrantPermTokenHead(eventGrant)) - for _, permission := range collection.Permission_value { - p := collection.Permission(permission) - if p == collection.PermissionUnspecified { - continue - } + for i := 1; i < len(collection.Permission_value); i++ { + p := collection.Permission(i) eventGrant.Permission = p ctx.EventManager().EmitEvent(collection.NewEventGrantPermTokenBody(eventGrant)) - k.Grant(ctx, contractID, []byte{}, creator, collection.Permission(permission)) + k.Grant(ctx, contractID, []byte{}, creator, p) } return contractID From e42a3b82a4eb6c51c844dbd1066b12043e4603be Mon Sep 17 00:00:00 2001 From: Youngtaek Yoon Date: Tue, 11 Apr 2023 09:10:05 +0900 Subject: [PATCH 2/6] Fix comments --- x/collection/module/module.go | 12 ++++++++---- x/foundation/module/module.go | 12 ++++++++---- x/token/module/module.go | 12 ++++++++---- 3 files changed, 24 insertions(+), 12 deletions(-) diff --git a/x/collection/module/module.go b/x/collection/module/module.go index e2bb57dcf7..3759eb0efc 100644 --- a/x/collection/module/module.go +++ b/x/collection/module/module.go @@ -111,10 +111,14 @@ func (am AppModule) RegisterServices(cfg module.Configurator) { collection.RegisterQueryServer(cfg.QueryServer(), keeper.NewQueryServer(am.keeper, am.authKeeper)) // m := keeper.NewMigrator(am.keeper) - // migrations := map[uint64]func(sdk.Context) error{} - // for ver, handler := range migrations { - // if err := cfg.RegisterMigration(collection.ModuleName, ver, handler); err != nil { - // panic(fmt.Sprintf("failed to migrate x/%s from version %d to %d: %v", collection.ModuleName, ver, ver+1, err)) + // migrations := []struct{ + // ver uint64 + // handler func(sdk.Context) error + // }{ + // } + // for _, mig := range migrations { + // if err := cfg.RegisterMigration(collection.ModuleName, mig.ver, mig.handler); err != nil { + // panic(fmt.Sprintf("failed to migrate x/%s from version %d to %d: %v", collection.ModuleName, mig.ver, mig.ver+1, err)) // } // } } diff --git a/x/foundation/module/module.go b/x/foundation/module/module.go index f4dbf3a438..fefe79d39d 100644 --- a/x/foundation/module/module.go +++ b/x/foundation/module/module.go @@ -114,10 +114,14 @@ func (am AppModule) RegisterServices(cfg module.Configurator) { foundation.RegisterQueryServer(cfg.QueryServer(), keeper.NewQueryServer(am.keeper)) // m := keeper.NewMigrator(am.keeper) - // migrations := map[uint64]func(sdk.Context) error{} - // for ver, handler := range migrations { - // if err := cfg.RegisterMigration(foundation.ModuleName, ver, handler); err != nil { - // panic(fmt.Sprintf("failed to migrate x/%s from version %d to %d: %v", foundation.ModuleName, ver, ver+1, err)) + // migrations := []struct{ + // ver uint64 + // handler func(sdk.Context) error + // }{ + // } + // for _, mig := range migrations { + // if err := cfg.RegisterMigration(foundation.ModuleName, mig.ver, mig.handler); err != nil { + // panic(fmt.Sprintf("failed to migrate x/%s from version %d to %d: %v", foundation.ModuleName, mig.ver, mig.ver+1, err)) // } // } } diff --git a/x/token/module/module.go b/x/token/module/module.go index daf0346e1c..2b561ca58f 100644 --- a/x/token/module/module.go +++ b/x/token/module/module.go @@ -111,10 +111,14 @@ func (am AppModule) RegisterServices(cfg module.Configurator) { token.RegisterQueryServer(cfg.QueryServer(), keeper.NewQueryServer(am.keeper, am.authKeeper)) // m := keeper.NewMigrator(am.keeper) - // migrations := map[uint64]func(sdk.Context) error{} - // for ver, handler := range migrations { - // if err := cfg.RegisterMigration(token.ModuleName, ver, handler); err != nil { - // panic(fmt.Sprintf("failed to migrate x/%s from version %d to %d: %v", token.ModuleName, ver, ver+1, err)) + // migrations := []struct{ + // ver uint64 + // handler func(sdk.Context) error + // } { + // } + // for _, mig := range migrations { + // if err := cfg.RegisterMigration(token.ModuleName, mig.ver, mig.handler); err != nil { + // panic(fmt.Sprintf("failed to migrate x/%s from version %d to %d: %v", token.ModuleName, mig.ver, mig.ver+1, err)) // } // } } From 5c7e1e60329d7f4b080d65be6a1d9ede877c15c7 Mon Sep 17 00:00:00 2001 From: Youngtaek Yoon Date: Tue, 11 Apr 2023 09:17:40 +0900 Subject: [PATCH 3/6] Update CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index d203240de0..4a6d4ada40 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -55,6 +55,7 @@ Ref: https://keepachangelog.com/en/1.0.0/ * (x/collection) [\#954](https://github.com/line/lbm-sdk/pull/954) Remove duplicated events in x/collection Msg/Modify * (x/collection) [\#955](https://github.com/line/lbm-sdk/pull/955) Return nil where the parent not exists in x/collection Query/Parent * (x/collection) [\#959](https://github.com/line/lbm-sdk/pull/959) Revert #955 and add Query/HasParent into x/collection +* (x/collection) [\#960](https://github.com/line/lbm-sdk/pull/960) Fix default next class ids of x/collection ### Removed From c736dbc7d05455984b04810b517daa5006bf4f17 Mon Sep 17 00:00:00 2001 From: Youngtaek Yoon Date: Tue, 11 Apr 2023 10:08:03 +0900 Subject: [PATCH 4/6] Update CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4a6d4ada40..b426c3d893 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -55,7 +55,7 @@ Ref: https://keepachangelog.com/en/1.0.0/ * (x/collection) [\#954](https://github.com/line/lbm-sdk/pull/954) Remove duplicated events in x/collection Msg/Modify * (x/collection) [\#955](https://github.com/line/lbm-sdk/pull/955) Return nil where the parent not exists in x/collection Query/Parent * (x/collection) [\#959](https://github.com/line/lbm-sdk/pull/959) Revert #955 and add Query/HasParent into x/collection -* (x/collection) [\#960](https://github.com/line/lbm-sdk/pull/960) Fix default next class ids of x/collection +* (x/collection) [\#961](https://github.com/line/lbm-sdk/pull/961) Do not loop enum in x/collection ### Removed From 85db7bfedf2171423aedf7b80f4baa8071900b2d Mon Sep 17 00:00:00 2001 From: Youngtaek Yoon Date: Tue, 11 Apr 2023 10:33:58 +0900 Subject: [PATCH 5/6] Remove unused logics in comments --- x/collection/module/module.go | 12 ------------ x/foundation/module/module.go | 12 ------------ x/stakingplus/module/module.go | 8 -------- x/token/module/module.go | 12 ------------ 4 files changed, 44 deletions(-) diff --git a/x/collection/module/module.go b/x/collection/module/module.go index 3759eb0efc..4c3892108e 100644 --- a/x/collection/module/module.go +++ b/x/collection/module/module.go @@ -109,18 +109,6 @@ func (am AppModule) LegacyQuerierHandler(legacyQuerierCdc *codec.LegacyAmino) sd func (am AppModule) RegisterServices(cfg module.Configurator) { collection.RegisterMsgServer(cfg.MsgServer(), keeper.NewMsgServer(am.keeper)) collection.RegisterQueryServer(cfg.QueryServer(), keeper.NewQueryServer(am.keeper, am.authKeeper)) - - // m := keeper.NewMigrator(am.keeper) - // migrations := []struct{ - // ver uint64 - // handler func(sdk.Context) error - // }{ - // } - // for _, mig := range migrations { - // if err := cfg.RegisterMigration(collection.ModuleName, mig.ver, mig.handler); err != nil { - // panic(fmt.Sprintf("failed to migrate x/%s from version %d to %d: %v", collection.ModuleName, mig.ver, mig.ver+1, err)) - // } - // } } // InitGenesis performs genesis initialization for the collection module. It returns diff --git a/x/foundation/module/module.go b/x/foundation/module/module.go index fefe79d39d..ac3de5db88 100644 --- a/x/foundation/module/module.go +++ b/x/foundation/module/module.go @@ -112,18 +112,6 @@ func (am AppModule) LegacyQuerierHandler(legacyQuerierCdc *codec.LegacyAmino) sd func (am AppModule) RegisterServices(cfg module.Configurator) { foundation.RegisterMsgServer(cfg.MsgServer(), keeper.NewMsgServer(am.keeper)) foundation.RegisterQueryServer(cfg.QueryServer(), keeper.NewQueryServer(am.keeper)) - - // m := keeper.NewMigrator(am.keeper) - // migrations := []struct{ - // ver uint64 - // handler func(sdk.Context) error - // }{ - // } - // for _, mig := range migrations { - // if err := cfg.RegisterMigration(foundation.ModuleName, mig.ver, mig.handler); err != nil { - // panic(fmt.Sprintf("failed to migrate x/%s from version %d to %d: %v", foundation.ModuleName, mig.ver, mig.ver+1, err)) - // } - // } } // InitGenesis performs genesis initialization for the foundation module. It returns diff --git a/x/stakingplus/module/module.go b/x/stakingplus/module/module.go index 3529b32241..bc8d6a446d 100644 --- a/x/stakingplus/module/module.go +++ b/x/stakingplus/module/module.go @@ -90,14 +90,6 @@ func (am AppModule) RegisterServices(cfg module.Configurator) { stakingtypes.RegisterMsgServer(cfg.MsgServer(), keeper.NewMsgServerImpl(am.keeper, am.fk)) querier := stakingkeeper.Querier{Keeper: am.keeper} stakingtypes.RegisterQueryServer(cfg.QueryServer(), querier) - - // m := keeper.NewMigrator(am.keeper) - // migrations := map[uint64]func(sdk.Context) error{} - // for ver, handler := range migrations { - // if err := cfg.RegisterMigration(foundation.ModuleName, ver, handler); err != nil { - // panic(fmt.Sprintf("failed to migrate x/%s from version %d to %d: %v", stakingplus.ModuleName, ver, ver+1, err)) - // } - // } } // InitGenesis performs genesis initialization for the stakingplus module. It returns diff --git a/x/token/module/module.go b/x/token/module/module.go index 2b561ca58f..e3b01d9eee 100644 --- a/x/token/module/module.go +++ b/x/token/module/module.go @@ -109,18 +109,6 @@ func (am AppModule) LegacyQuerierHandler(legacyQuerierCdc *codec.LegacyAmino) sd func (am AppModule) RegisterServices(cfg module.Configurator) { token.RegisterMsgServer(cfg.MsgServer(), keeper.NewMsgServer(am.keeper)) token.RegisterQueryServer(cfg.QueryServer(), keeper.NewQueryServer(am.keeper, am.authKeeper)) - - // m := keeper.NewMigrator(am.keeper) - // migrations := []struct{ - // ver uint64 - // handler func(sdk.Context) error - // } { - // } - // for _, mig := range migrations { - // if err := cfg.RegisterMigration(token.ModuleName, mig.ver, mig.handler); err != nil { - // panic(fmt.Sprintf("failed to migrate x/%s from version %d to %d: %v", token.ModuleName, mig.ver, mig.ver+1, err)) - // } - // } } // InitGenesis performs genesis initialization for the token module. It returns From 94a1404a222c9fba6460949cce839785a167853e Mon Sep 17 00:00:00 2001 From: Youngtaek Yoon Date: Tue, 11 Apr 2023 11:37:45 +0900 Subject: [PATCH 6/6] Update x/collection/keeper/supply.go --- x/collection/keeper/supply.go | 1 + 1 file changed, 1 insertion(+) diff --git a/x/collection/keeper/supply.go b/x/collection/keeper/supply.go index 0e5841b3bb..bedd0332ca 100644 --- a/x/collection/keeper/supply.go +++ b/x/collection/keeper/supply.go @@ -26,6 +26,7 @@ func (k Keeper) CreateContract(ctx sdk.Context, creator sdk.AccAddress, contract Grantee: creator.String(), } ctx.EventManager().EmitEvent(collection.NewEventGrantPermTokenHead(eventGrant)) + // 0 is "unspecified" for i := 1; i < len(collection.Permission_value); i++ { p := collection.Permission(i)