fix build errors & small var names cleanup

sunriselayer · May 20, 2024 · 8572b30 · 8572b30
1 parent d949b7d
commit 8572b30
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 21 deletions.
diff --git a/x/liquiditypool/keeper/msg_server_pool.go b/x/liquiditypool/keeper/msg_server_pool.go
@@ -11,11 +11,7 @@ func (k msgServer) CreatePool(goCtx context.Context, msg *types.MsgCreatePool) (
 	ctx := sdk.UnwrapSDKContext(goCtx)
 
 	var pool = types.Pool{}
-
-	id := k.AppendPool(
-		ctx,
-		pool,
-	)
+	id := k.AppendPool(ctx, pool)
 
 	return &types.MsgCreatePoolResponse{
 		Id: id,

diff --git a/x/liquiditypool/keeper/msg_server_position.go b/x/liquiditypool/keeper/msg_server_position.go
@@ -14,13 +14,10 @@ func (k msgServer) CreatePosition(goCtx context.Context, msg *types.MsgCreatePos
 	ctx := sdk.UnwrapSDKContext(goCtx)
 
 	var position = types.Position{
-		Sender: msg.Sender,
+		Address: msg.Sender,
 	}
 
-	id := k.AppendPosition(
-		ctx,
-		position,
-	)
+	id := k.AppendPosition(ctx, position)
 
 	return &types.MsgCreatePositionResponse{
 		Id: id,
@@ -31,8 +28,8 @@ func (k msgServer) IncreaseLiquidity(goCtx context.Context, msg *types.MsgIncrea
 	ctx := sdk.UnwrapSDKContext(goCtx)
 
 	var position = types.Position{
-		Sender: msg.Sender,
-		Id:     msg.Id,
+		Address: msg.Sender,
+		Id:      msg.Id,
 	}
 
 	// Checks that the element exists
@@ -42,7 +39,7 @@ func (k msgServer) IncreaseLiquidity(goCtx context.Context, msg *types.MsgIncrea
 	}
 
 	// Checks if the msg sender is the same as the current owner
-	if msg.Sender != val.Sender {
+	if msg.Sender != val.Address {
 		return nil, errorsmod.Wrap(sdkerrors.ErrUnauthorized, "incorrect owner")
 	}
 
@@ -55,13 +52,13 @@ func (k msgServer) DecreaseLiquidity(goCtx context.Context, msg *types.MsgDecrea
 	ctx := sdk.UnwrapSDKContext(goCtx)
 
 	// Checks that the element exists
-	val, found := k.GetPosition(ctx, msg.Id)
+	position, found := k.GetPosition(ctx, msg.Id)
 	if !found {
 		return nil, errorsmod.Wrap(sdkerrors.ErrKeyNotFound, fmt.Sprintf("key %d doesn't exist", msg.Id))
 	}
 
 	// Checks if the msg sender is the same as the current owner
-	if msg.Sender != val.Sender {
+	if msg.Sender != position.Address {
 		return nil, errorsmod.Wrap(sdkerrors.ErrUnauthorized, "incorrect owner")
 	}
 

diff --git a/x/liquiditypool/module/simulation.go b/x/liquiditypool/module/simulation.go
@@ -77,12 +77,12 @@ func (AppModule) GenerateGenesisState(simState *module.SimulationState) {
 		PoolCount: 2,
 		PositionList: []types.Position{
 			{
-				Id:     0,
-				Sender: sample.AccAddress(),
+				Id:      0,
+				Address: sample.AccAddress(),
 			},
 			{
-				Id:     1,
-				Sender: sample.AccAddress(),
+				Id:      1,
+				Address: sample.AccAddress(),
 			},
 		},
 		PositionCount: 2,

diff --git a/x/liquiditypool/simulation/position.go b/x/liquiditypool/simulation/position.go
@@ -57,7 +57,7 @@ func SimulateMsgIncreaseLiquidity(
 			found       = false
 		)
 		for _, obj := range allPosition {
-			simAccount, found = FindAccount(accs, obj.Sender)
+			simAccount, found = FindAccount(accs, obj.Address)
 			if found {
 				position = obj
 				break
@@ -101,7 +101,7 @@ func SimulateMsgDecreaseLiquidity(
 			found       = false
 		)
 		for _, obj := range allPosition {
-			simAccount, found = FindAccount(accs, obj.Sender)
+			simAccount, found = FindAccount(accs, obj.Address)
 			if found {
 				position = obj
 				break