Merge pull request #121 from notional-labs/ducnt/112

Only need ibc_denom to DeleteHostZoneProposal

proto/feeabstraction/absfee/v1beta1/proposal.proto

@@ -50,13 +50,13 @@ message AddHostZoneProposal {
 }
 
 message DeleteHostZoneProposal {
-  option (gogoproto.goproto_getters) = false;
-  // the title of the proposal
-  string title = 1;
-  // the description of the proposal
-  string description = 2;
-  // the host chain config
-  HostChainFeeAbsConfig host_chain_config = 3;
+	option (gogoproto.goproto_getters) = false;
+	// the title of the proposal
+	string title = 1;
+	// the description of the proposal
+	string description = 2;
+	// the  ibc denom of this token
+	string ibc_denom = 3;
 }
 
 message SetHostZoneProposal {

x/feeabs/client/cli/tx.go

@@ -151,7 +151,7 @@ func NewCmdSubmitDeleteHostZoneProposal() *cobra.Command {
 			}
 
 			content := types.NewDeleteHostZoneProposal(
-				proposal.Title, proposal.Description, proposal.HostChainFeeAbsConfig,
+				proposal.Title, proposal.Description, proposal.IbcDenom,
 			)
 
 			deposit, err := sdk.ParseCoinsNormalized(proposal.Deposit)

x/feeabs/client/cli/util.go

@@ -62,10 +62,10 @@ type (
 		Deposit               string                      `json:"deposit" yaml:"deposit"`
 	}
 	DeleteHostZoneProposalJSON struct {
-		Title                 string                      `json:"title" yaml:"title"`
-		Description           string                      `json:"description" yaml:"description"`
-		HostChainFeeAbsConfig types.HostChainFeeAbsConfig `json:"host_chain_fee_abs_config" yaml:"host_chain_fee_abs_config"`
-		Deposit               string                      `json:"deposit" yaml:"deposit"`
+		Title       string `json:"title" yaml:"title"`
+		Description string `json:"description" yaml:"description"`
+		IbcDenom    string `json:"ibc_denom" yaml:"ibc_denom"`
+		Deposit     string `json:"deposit" yaml:"deposit"`
 	}
 	SetHostZoneProposalJSON struct {
 		Title                 string                      `json:"title" yaml:"title"`

x/feeabs/keeper/proposal.go

@@ -20,12 +20,12 @@ func (k Keeper) AddHostZoneProposal(ctx sdk.Context, p *types.AddHostZoneProposa
 }
 
 func (k Keeper) DeleteHostZoneProposal(ctx sdk.Context, p *types.DeleteHostZoneProposal) error {
-	_, err := k.GetHostZoneConfig(ctx, p.HostChainConfig.IbcDenom)
+	_, err := k.GetHostZoneConfig(ctx, p.IbcDenom)
 	if err == nil {
 		return types.ErrHostZoneConfigNotFound
 	}
 
-	err = k.DeleteHostZoneConfig(ctx, p.HostChainConfig.IbcDenom)
+	err = k.DeleteHostZoneConfig(ctx, p.IbcDenom)
 	if err != nil {
 		return err
 	}

x/feeabs/types/proposal.go

@@ -32,11 +32,11 @@ func NewAddHostZoneProposal(title, description string, config HostChainFeeAbsCon
 	}
 }
 
-func NewDeleteHostZoneProposal(title, description string, config HostChainFeeAbsConfig) govtypes.Content {
+func NewDeleteHostZoneProposal(title, description, ibc_denom string) govtypes.Content {
 	return &DeleteHostZoneProposal{
-		Title:           title,
-		Description:     description,
-		HostChainConfig: &config,
+		Title:       title,
+		Description: description,
+		IbcDenom:    ibc_denom,
 	}
 }