Skip to content

Fix dex module test #321

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.

Sign up for GitHub

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

Merged
codchen merged 1 commit into from
Oct 20, 2022
Merged

Fix dex module test #321

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions loadtest/contracts/jupiter/Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion loadtest/contracts/jupiter/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ serde = { version = "1.0.127", default-features = false, features = ["derive"] }
serde_json = { version = "1.0", default-features = false, features = ["alloc"] }
thiserror = { version = "1.0.26" }
base64 = { version = "0.13.0" }
sei-cosmwasm = "0.2.0"
sei-cosmwasm = "0.3.0"

[dependencies.forward_ref]
version = "1"
Expand Down
2 changes: 1 addition & 1 deletion loadtest/contracts/jupiter/src/contract.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,11 +83,11 @@ pub fn process_bulk_order_placements(
position_direction: PositionDirection::Long,
order_type: OrderType::Limit,
data: "".to_string(),
status_description: "".to_string(),
};
let order = sei_cosmwasm::SeiMsg::PlaceOrders {
funds: vec![],
orders: vec![order_placement],
creator: env.contract.address,
contract_address: MARS_ADDR.load(deps.storage)?,
};
response = Response::new().add_message(order);
Expand Down
4 changes: 2 additions & 2 deletions loadtest/contracts/mars/Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion loadtest/contracts/mars/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ serde = { version = "1.0.127", default-features = false, features = ["derive"] }
serde_json = { version = "1.0", default-features = false, features = ["alloc"] }
thiserror = { version = "1.0.26" }
base64 = { version = "0.13.0" }
sei-cosmwasm = "0.2.0"
sei-cosmwasm = "0.3.0"

[dependencies.forward_ref]
version = "1"
Expand Down
2 changes: 1 addition & 1 deletion loadtest/contracts/saturn/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ serde = { version = "1.0.127", default-features = false, features = ["derive"] }
serde_json = { version = "1.0", default-features = false, features = ["alloc"] }
thiserror = { version = "1.0.26" }
base64 = { version = "0.13.0" }
sei-cosmwasm = "0.2.0"
sei-cosmwasm = "0.3.0"

[dependencies.forward_ref]
version = "1"
Expand Down
2 changes: 1 addition & 1 deletion loadtest/contracts/venus/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ serde = { version = "1.0.127", default-features = false, features = ["derive"] }
serde_json = { version = "1.0", default-features = false, features = ["alloc"] }
thiserror = { version = "1.0.26" }
base64 = { version = "0.13.0" }
sei-cosmwasm = "0.2.0"
sei-cosmwasm = "0.3.0"

[dependencies.forward_ref]
version = "1"
Expand Down
22 changes: 11 additions & 11 deletions x/dex/module_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ func TestEndBlockMarketOrder(t *testing.T) {
bankkeeper := testApp.BankKeeper
bankkeeper.MintCoins(ctx, minttypes.ModuleName, amounts)
bankkeeper.SendCoinsFromModuleToAccount(ctx, minttypes.ModuleName, testAccount, amounts)
wasm, err := ioutil.ReadFile("./testdata/clearing_house.wasm")
wasm, err := ioutil.ReadFile("./testdata/mars.wasm")
if err != nil {
panic(err)
}
Expand All @@ -62,7 +62,7 @@ func TestEndBlockMarketOrder(t *testing.T) {
if err != nil {
panic(err)
}
dexkeeper.SetContract(ctx, &types.ContractInfo{CodeId: 123, ContractAddr: contractAddr.String(), NeedHook: true, NeedOrderMatching: true})
dexkeeper.SetContract(ctx, &types.ContractInfo{CodeId: 123, ContractAddr: contractAddr.String(), NeedHook: false, NeedOrderMatching: true})
dexkeeper.AddRegisteredPair(ctx, contractAddr.String(), pair)
// place one order to a nonexistent contract
dexutils.GetMemState(ctx.Context()).GetBlockOrders(ctx, utils.ContractAddress(contractAddr.String()), utils.GetPairString(&pair)).Add(
Expand Down Expand Up @@ -128,7 +128,7 @@ func TestEndBlockMarketOrder(t *testing.T) {

// Long book should be removed since it's executed
// No state change should've been persisted for bad contract
_, found = dexkeeper.GetLongBookByPrice(ctx, contractAddr.String(), sdk.MustNewDecFromStr("1"), pair.PriceDenom, pair.AssetDenom)
_, found = dexkeeper.GetLongBookByPrice(ctx, contractAddr.String(), sdk.MustNewDecFromStr("2"), pair.PriceDenom, pair.AssetDenom)
// Long book should be populated
require.False(t, found)

Expand Down Expand Up @@ -167,7 +167,7 @@ func TestEndBlockRollback(t *testing.T) {
dexkeeper := testApp.DexKeeper
pair := TEST_PAIR()
// register contract and pair
dexkeeper.SetContract(ctx, &types.ContractInfo{CodeId: 123, ContractAddr: keepertest.TestContract, NeedHook: true, NeedOrderMatching: true})
dexkeeper.SetContract(ctx, &types.ContractInfo{CodeId: 123, ContractAddr: keepertest.TestContract, NeedHook: false, NeedOrderMatching: true})
dexkeeper.AddRegisteredPair(ctx, keepertest.TestContract, pair)
// place one order to a nonexistent contract
dexutils.GetMemState(ctx.Context()).GetBlockOrders(ctx, utils.ContractAddress(keepertest.TestContract), utils.GetPairString(&pair)).Add(
Expand Down Expand Up @@ -198,7 +198,7 @@ func TestEndBlockPartialRollback(t *testing.T) {
dexkeeper := testApp.DexKeeper
pair := TEST_PAIR()
// register contract and pair
dexkeeper.SetContract(ctx, &types.ContractInfo{CodeId: 123, ContractAddr: keepertest.TestContract, NeedHook: true, NeedOrderMatching: true})
dexkeeper.SetContract(ctx, &types.ContractInfo{CodeId: 123, ContractAddr: keepertest.TestContract, NeedHook: false, NeedOrderMatching: true})
dexkeeper.AddRegisteredPair(ctx, keepertest.TestContract, pair)
// place one order to a nonexistent contract
dexutils.GetMemState(ctx.Context()).GetBlockOrders(ctx, utils.ContractAddress(keepertest.TestContract), utils.GetPairString(&pair)).Add(
Expand All @@ -220,7 +220,7 @@ func TestEndBlockPartialRollback(t *testing.T) {
bankkeeper := testApp.BankKeeper
bankkeeper.MintCoins(ctx, minttypes.ModuleName, amounts)
bankkeeper.SendCoinsFromModuleToAccount(ctx, minttypes.ModuleName, testAccount, amounts)
wasm, err := ioutil.ReadFile("./testdata/clearing_house.wasm")
wasm, err := ioutil.ReadFile("./testdata/mars.wasm")
if err != nil {
panic(err)
}
Expand All @@ -236,7 +236,7 @@ func TestEndBlockPartialRollback(t *testing.T) {
if err != nil {
panic(err)
}
dexkeeper.SetContract(ctx, &types.ContractInfo{CodeId: 123, ContractAddr: contractAddr.String(), NeedHook: true, NeedOrderMatching: true})
dexkeeper.SetContract(ctx, &types.ContractInfo{CodeId: 123, ContractAddr: contractAddr.String(), NeedHook: false, NeedOrderMatching: true})
dexkeeper.AddRegisteredPair(ctx, contractAddr.String(), pair)
// place one order to a nonexistent contract
dexutils.GetMemState(ctx.Context()).GetBlockOrders(ctx, utils.ContractAddress(contractAddr.String()), utils.GetPairString(&pair)).Add(
Expand Down Expand Up @@ -284,7 +284,7 @@ func TestBeginBlock(t *testing.T) {
bankkeeper := testApp.BankKeeper
bankkeeper.MintCoins(ctx, minttypes.ModuleName, amounts)
bankkeeper.SendCoinsFromModuleToAccount(ctx, minttypes.ModuleName, testAccount, amounts)
wasm, err := ioutil.ReadFile("./testdata/clearing_house.wasm")
wasm, err := ioutil.ReadFile("./testdata/mars.wasm")
if err != nil {
panic(err)
}
Expand All @@ -300,7 +300,7 @@ func TestBeginBlock(t *testing.T) {
if err != nil {
panic(err)
}
dexkeeper.SetContract(ctx, &types.ContractInfo{CodeId: 123, ContractAddr: contractAddr.String(), NeedHook: true, NeedOrderMatching: true})
dexkeeper.SetContract(ctx, &types.ContractInfo{CodeId: 123, ContractAddr: contractAddr.String(), NeedHook: false, NeedOrderMatching: true})

// right now just make sure it doesn't crash since it doesn't register any state to be checked against
testApp.BeginBlocker(ctx, abci.RequestBeginBlock{})
Expand All @@ -324,7 +324,7 @@ func TestEndBlockPanicHandling(t *testing.T) {
bankkeeper := testApp.BankKeeper
bankkeeper.MintCoins(ctx, minttypes.ModuleName, amounts)
bankkeeper.SendCoinsFromModuleToAccount(ctx, minttypes.ModuleName, testAccount, amounts)
wasm, err := ioutil.ReadFile("./testdata/clearing_house.wasm")
wasm, err := ioutil.ReadFile("./testdata/mars.wasm")
if err != nil {
panic(err)
}
Expand All @@ -340,7 +340,7 @@ func TestEndBlockPanicHandling(t *testing.T) {
if err != nil {
panic(err)
}
dexkeeper.SetContract(ctx, &types.ContractInfo{CodeId: 123, ContractAddr: contractAddr.String(), NeedHook: true, NeedOrderMatching: true})
dexkeeper.SetContract(ctx, &types.ContractInfo{CodeId: 123, ContractAddr: contractAddr.String(), NeedHook: false, NeedOrderMatching: true})
dexkeeper.AddRegisteredPair(ctx, contractAddr.String(), pair)
dexutils.GetMemState(ctx.Context()).GetBlockOrders(ctx, utils.ContractAddress(contractAddr.String()), utils.GetPairString(&pair)).Add(
&types.Order{
Expand Down
Binary file added x/dex/testdata/mars.wasm
View file
Open in desktop
Binary file not shown.