diff --git a/x/concentrated-liquidity/position_test.go b/x/concentrated-liquidity/position_test.go index 991ef0b46e5..e72260e8cc0 100644 --- a/x/concentrated-liquidity/position_test.go +++ b/x/concentrated-liquidity/position_test.go @@ -1,7 +1,6 @@ package concentrated_liquidity_test import ( - "fmt" "time" sdk "github.com/cosmos/cosmos-sdk/types" @@ -14,7 +13,6 @@ import ( cl "github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity" "github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity/model" "github.com/osmosis-labs/osmosis/v16/x/concentrated-liquidity/types" - lockuptypes "github.com/osmosis-labs/osmosis/v16/x/lockup/types" ) const ( @@ -2408,16 +2406,6 @@ func (s *KeeperTestSuite) TestCreateFullRangePositionLocked() { concentratedLock, err := s.App.LockupKeeper.GetLockByID(s.Ctx, concentratedLockId) s.Require().NoError(err) - // TODO: @stack, add assertion around what happens to the lock tokens once it expires - // TODO: @stack: Add assertions to check if the module aaccount recieved correct liquidity - moduleAccAddr := s.App.AccountKeeper.GetModuleAccount(s.Ctx, lockuptypes.ModuleName) - - moduleCoins := s.App.BankKeeper.GetAllBalances(s.Ctx, moduleAccAddr.GetAddress()) - ownerCoins := s.App.BankKeeper.GetAllBalances(s.Ctx, sdk.AccAddress([]byte(position.Address))) - - fmt.Println("LOCK MODULE COINS: ", moduleCoins) // 70710678cl/pool/1 - fmt.Println("LOCK OWNER COINS: ", ownerCoins) // 10000000000bar,10000000000baz,10000000000foo,9000000000uosmo - s.Require().Equal(concentratedLock.Coins[0].Amount.String(), liquidity.TruncateInt().String()) s.Require().False(concentratedLock.IsUnlocking()) }) diff --git a/x/lockup/keeper/lock.go b/x/lockup/keeper/lock.go index 4a319e9a621..c9c1231093c 100644 --- a/x/lockup/keeper/lock.go +++ b/x/lockup/keeper/lock.go @@ -387,7 +387,6 @@ func (k Keeper) ForceUnlock(ctx sdk.Context, lock types.PeriodLock) error { return err } if !synthLock.IsNil() { - fmt.Println("REMOVEEE SYNTHETIC LOCKUPPP") err = k.DeleteSyntheticLockup(ctx, lock.ID, synthLock.SynthDenom) if err != nil { return err diff --git a/x/superfluid/keeper/migrate.go b/x/superfluid/keeper/migrate.go index ed42c936367..2d1632e2f9a 100644 --- a/x/superfluid/keeper/migrate.go +++ b/x/superfluid/keeper/migrate.go @@ -56,7 +56,6 @@ func (k Keeper) RouteLockedBalancerToConcentratedMigration(ctx sdk.Context, send case NonSuperfluid: positionId, amount0, amount1, liquidity, concentratedLockId, poolIdLeaving, poolIdEntering, err = k.migrateNonSuperfluidLockBalancerToConcentrated(ctx, sender, lockId, sharesToMigrate, tokenOutMins) case Unlocked: - fmt.Println("unlocked case") positionId, amount0, amount1, liquidity, poolIdLeaving, poolIdEntering, err = k.gk.MigrateUnlockedPositionFromBalancerToConcentrated(ctx, sender, sharesToMigrate, tokenOutMins) concentratedLockId = 0 default: diff --git a/x/superfluid/keeper/migrate_test.go b/x/superfluid/keeper/migrate_test.go index b35b3c55686..c54bce44b87 100644 --- a/x/superfluid/keeper/migrate_test.go +++ b/x/superfluid/keeper/migrate_test.go @@ -411,8 +411,7 @@ func (s *KeeperTestSuite) TestMigrateSuperfluidBondedBalancerToConcentrated() { clIntermediaryAcc := superfluidKeeper.GetLockIdIntermediaryAccountConnection(s.Ctx, concentratedLockId) delegation, found := stakingKeeper.GetDelegation(s.Ctx, clIntermediaryAcc, valAddr) s.Require().True(found, "expected delegation, found delegation no delegation") - s.Require().Equal(balancerDelegationPre.Shares.Mul(tc.percentOfSharesToMigrate).RoundInt().Sub(sdk.OneInt()).String(), delegation.Shares.RoundInt().String(), "expected %d shares, found %d shares", - balancerDelegationPre.Shares.Mul(tc.percentOfSharesToMigrate).RoundInt().String(), delegation.Shares.String()) + s.Require().Equal(balancerDelegationPre.Shares.Mul(tc.percentOfSharesToMigrate).RoundInt().Sub(sdk.OneInt()).String(), delegation.Shares.RoundInt().String(), "expected %d shares, found %d shares", balancerDelegationPre.Shares.Mul(tc.percentOfSharesToMigrate).RoundInt().String(), delegation.Shares.String()) // Check if the new intermediary account connection was created. newConcentratedIntermediaryAccount := superfluidKeeper.GetLockIdIntermediaryAccountConnection(s.Ctx, concentratedLockId) @@ -421,8 +420,7 @@ func (s *KeeperTestSuite) TestMigrateSuperfluidBondedBalancerToConcentrated() { // Check newly created concentrated lock. concentratedLock, err := lockupKeeper.GetLockByID(s.Ctx, concentratedLockId) s.Require().NoError(err) - // ? This is off by one 5000 -> 4999 - fmt.Println("LIQUIDITY", liquidityMigrated, coinsToMigrate, concentratedLock.Coins[0]) + s.Require().Equal(liquidityMigrated.TruncateInt().String(), concentratedLock.Coins[0].Amount.String(), "expected %s shares, found %s shares", coinsToMigrate.Amount.String(), concentratedLock.Coins[0].Amount.String()) s.Require().Equal(balancerLock.Duration, concentratedLock.Duration) s.Require().Equal(balancerLock.EndTime, concentratedLock.EndTime)