Renamed from property to avoid python name clash

NibiruChain · Jul 22, 2022 · 1dd84df · 1dd84df
1 parent 88ad253
commit 1dd84df
Show file tree

Hide file tree

Showing 5 changed files with 49 additions and 50 deletions.
diff --git a/proto/pricefeed/tx.proto b/proto/pricefeed/tx.proto
@@ -22,7 +22,7 @@ message MsgPostPrice {
   option (gogoproto.goproto_getters) = false;
 
   // From: address of oracle
-  string from = 1;
+  string oracle = 1;
   // Token0: denominator unit of the price, a.k.a. quote asset
   string token0 = 2 ;
   // Token1: numerator unit of price, a.k.a. base asset

diff --git a/x/pricefeed/keeper/msg_server.go b/x/pricefeed/keeper/msg_server.go
@@ -31,7 +31,7 @@ func (k msgServer) PostPrice(goCtx context.Context, msg *types.MsgPostPrice,
 ) (*types.MsgPostPriceResponse, error) {
 	ctx := sdk.UnwrapSDKContext(goCtx)
 
-	from, err := sdk.AccAddressFromBech32(msg.From)
+	from, err := sdk.AccAddressFromBech32(msg.Oracle)
 	if err != nil {
 		return nil, err
 	}
@@ -64,7 +64,7 @@ func (k msgServer) PostPrice(goCtx context.Context, msg *types.MsgPostPrice,
 		sdk.NewEvent(
 			sdk.EventTypeMessage,
 			sdk.NewAttribute(sdk.AttributeKeyModule, types.ModuleName),
-			sdk.NewAttribute(sdk.AttributeKeySender, msg.From),
+			sdk.NewAttribute(sdk.AttributeKeySender, msg.Oracle),
 		),
 	)
 

diff --git a/x/pricefeed/simulation/post_price.go b/x/pricefeed/simulation/post_price.go
@@ -20,7 +20,7 @@ func SimulateMsgPostPrice(
 	) (simtypes.OperationMsg, []simtypes.FutureOperation, error) {
 		simAccount, _ := simtypes.RandomAcc(r, accs)
 		msg := &types.MsgPostPrice{
-			From: simAccount.Address.String(),
+			Oracle: simAccount.Address.String(),
 		}
 
 		// TODO: Handling the PostPrice simulation

diff --git a/x/pricefeed/types/message_post_price.go b/x/pricefeed/types/message_post_price.go
@@ -19,7 +19,7 @@ var _ sdk.Msg = &MsgPostPrice{}
 
 func NewMsgPostPrice(creator string, token0 string, token1 string, price sdk.Dec, expiry time.Time) *MsgPostPrice {
 	return &MsgPostPrice{
-		From:   creator,
+		Oracle: creator,
 		Token0: token0,
 		Token1: token1,
 		Price:  price,
@@ -36,7 +36,7 @@ func (msg *MsgPostPrice) Type() string {
 }
 
 func (msg *MsgPostPrice) GetSigners() []sdk.AccAddress {
-	creator, err := sdk.AccAddressFromBech32(msg.From)
+	creator, err := sdk.AccAddressFromBech32(msg.Oracle)
 	if err != nil {
 		panic(err)
 	}
@@ -49,7 +49,7 @@ func (msg *MsgPostPrice) GetSignBytes() []byte {
 }
 
 func (msg *MsgPostPrice) ValidateBasic() error {
-	_, err := sdk.AccAddressFromBech32(msg.From)
+	_, err := sdk.AccAddressFromBech32(msg.Oracle)
 	if err != nil {
 		return sdkerrors.Wrapf(sdkerrors.ErrInvalidAddress, "invalid creator address (%s)", err)
 	}

diff --git a/x/pricefeed/types/tx.pb.go b/x/pricefeed/types/tx.pb.go