rebased

x/lockup/keeper/msg_server.go

@@ -46,10 +46,8 @@ func (server msgServer) LockTokens(goCtx context.Context, msg *types.MsgLockToke
 			return nil, err
 		}
 
-	// return the lock id of the existing lock when successfully added to the existing lock.
-	if len(locks) > 0 {
-		events.EmitAddTokenToLock(ctx, locks[0].ID, msg.GetOwner(), msg.GetCoins().String())
-		return &types.MsgLockTokensResponse{ID: locks[0].ID}, nil
+		events.EmitAddTokenToLock(ctx, lockID, msg.Owner, msg.Coins.String())
+		return &types.MsgLockTokensResponse{ID: lockID}, nil
 	}
 
 	// if the owner + duration combination is new, create a new lock.
@@ -59,7 +57,6 @@ func (server msgServer) LockTokens(goCtx context.Context, msg *types.MsgLockToke
 	}
 
 	events.EmitLockToken(ctx, &lock)
-
 	return &types.MsgLockTokensResponse{ID: lock.ID}, nil
 }
 
@@ -88,7 +85,6 @@ func (server msgServer) BeginUnlocking(goCtx context.Context, msg *types.MsgBegi
 	}
 
 	events.EmitBeginUnlock(ctx, lock)
-
 	return &types.MsgBeginUnlockingResponse{}, nil
 }
 
@@ -115,7 +111,6 @@ func (server msgServer) BeginUnlockingAll(goCtx context.Context, msg *types.MsgB
 			sdk.NewAttribute(types.AttributeUnlockedCoins, unlockedCoins.String()),
 		),
 	}
-
 	for _, lock := range unlocks {
 		lock := lock
 		allEvents = allEvents.AppendEvent(events.BeginUnlockEvent(&lock))

x/lockup/keeper/msg_server_test.go

@@ -330,5 +330,3 @@ func (suite *KeeperTestSuite) TestMsgEditLockup() {
 		}
 	}
 }
-
-// TODO: ADD add to existing lock test