diff --git a/x/marker/keeper/msg_server.go b/x/marker/keeper/msg_server.go index 1daaece7f6..71d814f441 100644 --- a/x/marker/keeper/msg_server.go +++ b/x/marker/keeper/msg_server.go @@ -113,7 +113,7 @@ func (k msgServer) AddMarker(goCtx context.Context, msg *types.MsgAddMarkerReque return nil, sdkerrors.ErrInvalidRequest.Wrap(err.Error()) } - nav := types.NewNetAssetValue(sdk.NewInt64Coin(types.UsdDenom, int64(msg.UsdCents)), msg.Volume) + nav := types.NewNetAssetValue(sdk.NewInt64Coin(types.UsdDenom, int64(msg.UsdMills)), msg.Volume) err = k.AddSetNetAssetValues(ctx, ma, []types.NetAssetValue{nav}, types.ModuleName) if err != nil { return nil, sdkerrors.ErrInvalidRequest.Wrap(err.Error()) @@ -601,7 +601,7 @@ func (k msgServer) AddFinalizeActivateMarker(goCtx context.Context, msg *types.M normalizedReqAttrs, ) - err = k.AddSetNetAssetValues(ctx, ma, []types.NetAssetValue{types.NewNetAssetValue(sdk.NewInt64Coin(types.UsdDenom, int64(msg.UsdCents)), msg.Volume)}, types.ModuleName) + err = k.AddSetNetAssetValues(ctx, ma, []types.NetAssetValue{types.NewNetAssetValue(sdk.NewInt64Coin(types.UsdDenom, int64(msg.UsdMills)), msg.Volume)}, types.ModuleName) if err != nil { return nil, sdkerrors.ErrInvalidRequest.Wrap(err.Error()) } diff --git a/x/marker/keeper/msg_server_test.go b/x/marker/keeper/msg_server_test.go index f63e9fcdec..e4a692bc34 100644 --- a/x/marker/keeper/msg_server_test.go +++ b/x/marker/keeper/msg_server_test.go @@ -140,7 +140,7 @@ func (s *MsgServerTestSuite) TestMsgAddMarkerRequest() { SupplyFixed: true, AllowGovernanceControl: true, AllowForcedTransfer: false, - UsdCents: 1, + UsdMills: 1, Volume: 0, }, expErr: `cannot set net asset value : marker net asset value volume must be positive value: invalid request`, @@ -156,7 +156,7 @@ func (s *MsgServerTestSuite) TestMsgAddMarkerRequest() { SupplyFixed: true, AllowGovernanceControl: true, AllowForcedTransfer: false, - UsdCents: 1, + UsdMills: 1, Volume: 10, }, expEvent: []proto.Message{ diff --git a/x/marker/types/msg.go b/x/marker/types/msg.go index 7b96c759e7..85c6307d44 100644 --- a/x/marker/types/msg.go +++ b/x/marker/types/msg.go @@ -52,7 +52,7 @@ func NewMsgAddMarkerRequest( allowGovernanceControl bool, allowForcedTransfer bool, requiredAttributes []string, - usdCentValue uint64, + usdMills uint64, volume uint64, ) *MsgAddMarkerRequest { return &MsgAddMarkerRequest{ @@ -65,7 +65,7 @@ func NewMsgAddMarkerRequest( AllowGovernanceControl: allowGovernanceControl, AllowForcedTransfer: allowForcedTransfer, RequiredAttributes: requiredAttributes, - UsdCents: usdCentValue, + UsdMills: usdMills, Volume: volume, } } @@ -478,6 +478,7 @@ func (msg MsgGrantAllowanceRequest) GetSigners() []sdk.AccAddress { return []sdk.AccAddress{sdk.MustAccAddressFromBech32(msg.Administrator)} } +// NewMsgAddFinalizeActivateMarkerRequest creates a new MsgAddFinalizeActivateMarkerRequest. func NewMsgAddFinalizeActivateMarkerRequest( denom string, totalSupply sdkmath.Int, @@ -489,7 +490,7 @@ func NewMsgAddFinalizeActivateMarkerRequest( allowForcedTransfer bool, requiredAttributes []string, accessGrants []AccessGrant, - usdCentsValue uint64, + usdMills uint64, netAssetVolume uint64, ) *MsgAddFinalizeActivateMarkerRequest { return &MsgAddFinalizeActivateMarkerRequest{ @@ -502,7 +503,7 @@ func NewMsgAddFinalizeActivateMarkerRequest( AccessList: accessGrants, AllowForcedTransfer: allowForcedTransfer, RequiredAttributes: requiredAttributes, - UsdCents: usdCentsValue, + UsdMills: usdMills, Volume: netAssetVolume, } }