-
Notifications
You must be signed in to change notification settings - Fork 584
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Test improvisation for Superfluid #1070
Merged
Merged
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit
Hold shift + click to select a range
855d1bd
add utility for SetupGammPoolsAndSuperfluidAssets
antstalepresh 7022ac1
remove hardcoded gamm pool denoms
antstalepresh a594d4e
fix for main branch ctx => Ctx, app => App in tests
antstalepresh 5cf7074
Test Changes
mattverse 97de47c
Add testing packages
mattverse b5d08ce
Merge main
mattverse 7d05021
Delete fmt
mattverse 7b278b9
Fix lint
mattverse 505dd3c
Remove multiple pacakges for apptesting
mattverse be3a65e
Add parameter for reward allocation
mattverse 2390648
Improvements on test
mattverse File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Add testing packages
- Loading branch information
commit 97de47c6e15de9191986df1c1fce7f80bf1e25ee
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,88 @@ | ||
package balancertesting | ||
|
||
import ( | ||
"fmt" | ||
|
||
"github.com/cosmos/cosmos-sdk/simapp" | ||
sdk "github.com/cosmos/cosmos-sdk/types" | ||
"github.com/osmosis-labs/osmosis/v7/app/apptesting" | ||
"github.com/osmosis-labs/osmosis/v7/x/gamm/pool-models/balancer" | ||
gammtypes "github.com/osmosis-labs/osmosis/v7/x/gamm/types" | ||
"github.com/tendermint/tendermint/crypto/ed25519" | ||
) | ||
|
||
type BalancerTestHelper struct { | ||
*apptesting.KeeperTestHelper | ||
} | ||
|
||
func (balancerTestHelper *BalancerTestHelper) SetupGammPoolsWithBondDenomMultiplier(multipliers []sdk.Dec) []gammtypes.PoolI { | ||
balancerTestHelper.App.GAMMKeeper.SetParams(balancerTestHelper.Ctx, gammtypes.Params{ | ||
PoolCreationFee: sdk.Coins{}, | ||
}) | ||
|
||
bondDenom := balancerTestHelper.App.StakingKeeper.BondDenom(balancerTestHelper.Ctx) | ||
acc1 := sdk.AccAddress(ed25519.GenPrivKey().PubKey().Address().Bytes()) | ||
|
||
pools := []gammtypes.PoolI{} | ||
|
||
for index, multiplier := range multipliers { | ||
token := fmt.Sprintf("token%d", index) | ||
|
||
uosmoAmount := gammtypes.InitPoolSharesSupply.ToDec().Mul(multiplier).RoundInt() | ||
|
||
err := simapp.FundAccount(balancerTestHelper.App.BankKeeper, balancerTestHelper.Ctx, acc1, sdk.NewCoins( | ||
sdk.NewCoin(bondDenom, uosmoAmount.Mul(sdk.NewInt(10))), | ||
sdk.NewInt64Coin(token, 100000), | ||
)) | ||
balancerTestHelper.NoError(err) | ||
|
||
var ( | ||
defaultFutureGovernor = "" | ||
|
||
// pool assets | ||
defaultFooAsset gammtypes.PoolAsset = gammtypes.PoolAsset{ | ||
Weight: sdk.NewInt(100), | ||
Token: sdk.NewCoin(bondDenom, uosmoAmount), | ||
} | ||
defaultBarAsset gammtypes.PoolAsset = gammtypes.PoolAsset{ | ||
Weight: sdk.NewInt(100), | ||
Token: sdk.NewCoin(token, sdk.NewInt(10000)), | ||
} | ||
poolAssets []gammtypes.PoolAsset = []gammtypes.PoolAsset{defaultFooAsset, defaultBarAsset} | ||
) | ||
|
||
poolId, err := balancerTestHelper.App.GAMMKeeper.CreateBalancerPool(balancerTestHelper.Ctx, acc1, balancer.PoolParams{ | ||
SwapFee: sdk.NewDecWithPrec(1, 2), | ||
ExitFee: sdk.NewDecWithPrec(1, 2), | ||
}, poolAssets, defaultFutureGovernor) | ||
balancerTestHelper.Require().NoError(err) | ||
|
||
pool, err := balancerTestHelper.App.GAMMKeeper.GetPool(balancerTestHelper.Ctx, poolId) | ||
balancerTestHelper.Require().NoError(err) | ||
|
||
pools = append(pools, pool) | ||
} | ||
return pools | ||
} | ||
|
||
// SwapAndSetSpotPrice runs a swap to set Spot price of a pool using arbitrary values | ||
// returns spot price after the arbitrary swap | ||
func (balancerTestHelper *BalancerTestHelper) SwapAndSetSpotPrice(poolId uint64, fromAsset gammtypes.PoolAsset, toAsset gammtypes.PoolAsset) sdk.Dec { | ||
// create a dummy account | ||
acc1 := sdk.AccAddress(ed25519.GenPrivKey().PubKey().Address().Bytes()) | ||
|
||
// fund dummy account with tokens to swap | ||
coins := sdk.Coins{sdk.NewInt64Coin(fromAsset.Token.Denom, 100000000000000)} | ||
err := simapp.FundAccount(balancerTestHelper.App.BankKeeper, balancerTestHelper.Ctx, acc1, coins) | ||
balancerTestHelper.Require().NoError(err) | ||
|
||
_, _, err = balancerTestHelper.App.GAMMKeeper.SwapExactAmountOut( | ||
balancerTestHelper.Ctx, acc1, | ||
poolId, fromAsset.Token.Denom, fromAsset.Token.Amount, | ||
sdk.NewCoin(toAsset.Token.Denom, toAsset.Token.Amount.Quo(sdk.NewInt(4)))) | ||
balancerTestHelper.Require().NoError(err) | ||
|
||
spotPrice, err := balancerTestHelper.App.GAMMKeeper.CalculateSpotPrice(balancerTestHelper.Ctx, poolId, toAsset.Token.Denom, fromAsset.Token.Denom) | ||
balancerTestHelper.Require().NoError(err) | ||
return spotPrice | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,25 @@ | ||
package lockuptesting | ||
|
||
import ( | ||
"time" | ||
|
||
"github.com/cosmos/cosmos-sdk/simapp" | ||
sdk "github.com/cosmos/cosmos-sdk/types" | ||
"github.com/osmosis-labs/osmosis/v7/app/apptesting" | ||
|
||
lockupkeeper "github.com/osmosis-labs/osmosis/v7/x/lockup/keeper" | ||
lockuptypes "github.com/osmosis-labs/osmosis/v7/x/lockup/types" | ||
) | ||
|
||
type LockupTestHelper struct { | ||
*apptesting.KeeperTestHelper | ||
} | ||
|
||
func (lockupTestHelper *LockupTestHelper) LockTokens(addr sdk.AccAddress, coins sdk.Coins, duration time.Duration) (lockID uint64) { | ||
msgServer := lockupkeeper.NewMsgServerImpl(lockupTestHelper.App.LockupKeeper) | ||
err := simapp.FundAccount(lockupTestHelper.App.BankKeeper, lockupTestHelper.Ctx, addr, coins) | ||
lockupTestHelper.Require().NoError(err) | ||
msgResponse, err := msgServer.LockTokens(sdk.WrapSDKContext(lockupTestHelper.Ctx), lockuptypes.NewMsgLockTokens(addr, duration, coins)) | ||
lockupTestHelper.Require().NoError(err) | ||
return msgResponse.ID | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LockTokens should be used on all LockTokens related tests, not only superfluid?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Do you mean I should change other tests in other packages to use this as well?