address code review comments

CosmWasm · May 6, 2022 · 1edabd9 · 1edabd9
1 parent eecd11d
commit 1edabd9
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 26 deletions.
diff --git a/x/wasm/client/rest/gov.go b/x/wasm/client/rest/gov.go
@@ -427,8 +427,6 @@ type UpdateInstantiateConfigProposalJSONReq struct {
 	Deposit     sdk.Coins `json:"deposit" yaml:"deposit"`
 
 	CodeUpdates []types.CodeAccessConfigUpdate `json:"code_updates" yaml:"code_updates"`
-	// InstantiatePermission to apply on contract creation, optional
-	InstantiatePermission *types.AccessConfig `json:"instantiate_permission" yaml:"instantiate_permission"`
 }
 
 func (s UpdateInstantiateConfigProposalJSONReq) Content() govtypes.Content {
@@ -450,9 +448,9 @@ func (s UpdateInstantiateConfigProposalJSONReq) GetBaseReq() rest.BaseReq {
 
 func UpdateInstantiateConfigProposalHandler(cliCtx client.Context) govrest.ProposalRESTHandler {
 	return govrest.ProposalRESTHandler{
-		SubRoute: "update_instatiate_config",
+		SubRoute: "update_instantiate_config",
 		Handler: func(w http.ResponseWriter, r *http.Request) {
-			var req UnpinCodeJSONReq
+			var req UpdateInstantiateConfigProposalJSONReq
 			if !rest.ReadRESTReq(w, r, cliCtx.LegacyAmino, &req) {
 				return
 			}

diff --git a/x/wasm/keeper/proposal_integration_test.go b/x/wasm/keeper/proposal_integration_test.go
@@ -767,42 +767,39 @@ func TestUpdateInstantiateConfigProposal(t *testing.T) {
 		everybody   = StoreRandomContractWithAccessConfig(t, ctx, keepers, &mock, &types.AllowEverybody)
 		withAddress = StoreRandomContractWithAccessConfig(t, ctx, keepers, &mock, &withAddressAccessConfig)
 	)
-	type codeUpdate struct {
-		codeID       uint64
-		AccessConfig types.AccessConfig
-	}
+
 	specs := map[string]struct {
-		codeUpdates []codeUpdate
+		codeUpdates []types.CodeAccessConfigUpdate
 		expErr      bool
 	}{
 		"update one": {
-			codeUpdates: []codeUpdate{
-				{codeID: nobody.CodeID, AccessConfig: types.AllowEverybody},
+			codeUpdates: []types.CodeAccessConfigUpdate{
+				{CodeID: nobody.CodeID, InstantiatePermission: types.AllowEverybody},
 			},
 		},
 		"update multiple": {
-			codeUpdates: []codeUpdate{
-				{codeID: everybody.CodeID, AccessConfig: types.AllowNobody},
-				{codeID: nobody.CodeID, AccessConfig: withAddressAccessConfig},
-				{codeID: withAddress.CodeID, AccessConfig: types.AllowEverybody},
+			codeUpdates: []types.CodeAccessConfigUpdate{
+				{CodeID: everybody.CodeID, InstantiatePermission: types.AllowNobody},
+				{CodeID: nobody.CodeID, InstantiatePermission: withAddressAccessConfig},
+				{CodeID: withAddress.CodeID, InstantiatePermission: types.AllowEverybody},
 			},
 		},
 		"update same code id": {
-			codeUpdates: []codeUpdate{
-				{codeID: everybody.CodeID, AccessConfig: types.AllowNobody},
-				{codeID: everybody.CodeID, AccessConfig: types.AllowEverybody},
+			codeUpdates: []types.CodeAccessConfigUpdate{
+				{CodeID: everybody.CodeID, InstantiatePermission: types.AllowNobody},
+				{CodeID: everybody.CodeID, InstantiatePermission: types.AllowEverybody},
 			},
 			expErr: true,
 		},
 		"update non existing code id": {
-			codeUpdates: []codeUpdate{
-				{codeID: 100, AccessConfig: types.AllowNobody},
-				{codeID: everybody.CodeID, AccessConfig: types.AllowEverybody},
+			codeUpdates: []types.CodeAccessConfigUpdate{
+				{CodeID: 100, InstantiatePermission: types.AllowNobody},
+				{CodeID: everybody.CodeID, InstantiatePermission: types.AllowEverybody},
 			},
 			expErr: true,
 		},
 		"update empty list": {
-			codeUpdates: make([]codeUpdate, 0),
+			codeUpdates: make([]types.CodeAccessConfigUpdate, 0),
 			expErr:      true,
 		},
 	}
@@ -815,8 +812,8 @@ func TestUpdateInstantiateConfigProposal(t *testing.T) {
 			updates := make([]types.CodeAccessConfigUpdate, 0)
 			for _, cu := range spec.codeUpdates {
 				updates = append(updates, types.CodeAccessConfigUpdate{
-					CodeID:                cu.codeID,
-					InstantiatePermission: cu.AccessConfig,
+					CodeID:                cu.CodeID,
+					InstantiatePermission: cu.InstantiatePermission,
 				})
 			}
 
@@ -841,8 +838,8 @@ func TestUpdateInstantiateConfigProposal(t *testing.T) {
 
 			// then
 			for i := range spec.codeUpdates {
-				c := wasmKeeper.GetCodeInfo(ctx, spec.codeUpdates[i].codeID)
-				require.Equal(t, spec.codeUpdates[i].AccessConfig, c.InstantiateConfig)
+				c := wasmKeeper.GetCodeInfo(ctx, spec.codeUpdates[i].CodeID)
+				require.Equal(t, spec.codeUpdates[i].InstantiatePermission, c.InstantiateConfig)
 			}
 		})
 	}