Skip to content

Commit

Permalink
update test-tube for osmosis v25
Browse files Browse the repository at this point in the history
  • Loading branch information
@iboss-ptk
iboss-ptk committed May 17, 2024
1 parent a7e1de5 commit 4dc62d8
Show file tree
Hide file tree
Showing 19 changed files with 112 additions and 111 deletions.
14 changes: 8 additions & 6 deletions packages/osmosis-test-tube/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,22 @@ edition = "2021"
license = "MIT OR Apache-2.0"
name = "osmosis-test-tube"
repository = "https://github.com/osmosis-labs/test-tube"
version = "24.0.1"
version = "25.0.0"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

exclude = ["osmosis", "test_artifacts"]

[dependencies]
base64 = "0.21.5"
cosmrs = {version = "0.15.0", features = ["cosmwasm"]}
cosmwasm-std = "1.4.0"
osmosis-std = {git = " https://github.com/osmosis-labs/osmosis-rust", branch = "main"}
cosmrs = { version = "0.15.0", features = ["cosmwasm"] }
cosmwasm-std = "1.5.5"
osmosis-std = "0.25.0"
prost = "0.12.3"
serde = "1.0.144"
serde_json = "1.0.85"
test-tube = {version = "0.6.0", path = "../test-tube", features = ["module-wrappers"]}
test-tube = { version = "0.7.0", path = "../test-tube", features = [
"module-wrappers",
] }
thiserror = "1.0.34"

[features]
Expand All @@ -30,4 +32,4 @@ bindgen = "0.69.1"
[dev-dependencies]
cw1-whitelist = "1.1.1"
rayon = "1.5.3"
simple-sudo = {path = "../../test_contracts/simple-sudo"}
simple-sudo = { path = "../../test_contracts/simple-sudo" }
26 changes: 13 additions & 13 deletions packages/osmosis-test-tube/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ let app = OsmosisTestApp::new();
let accs = app
.init_accounts(
&[
Coin::new(1_000_000_000_000, "uatom"),
Coin::new(1_000_000_000_000, "uosmo"),
Coin::new(1_000_000_000_000u128, "uatom"),
Coin::new(1_000_000_000_000u128, "uosmo"),
],
2,
)
Expand All @@ -53,8 +53,8 @@ use osmosis_test_tube::OsmosisTestApp;
let app = OsmosisTestApp::new();

let account = app.init_account(&[
Coin::new(1_000_000_000_000, "uatom"),
Coin::new(1_000_000_000_000, "uosmo"),
Coin::new(1_000_000_000_000u128, "uatom"),
Coin::new(1_000_000_000_000u128, "uosmo"),
]);
```

Expand All @@ -75,8 +75,8 @@ let app = OsmosisTestApp::new();
let accs = app
.init_accounts(
&[
Coin::new(1_000_000_000_000, "uatom"),
Coin::new(1_000_000_000_000, "uosmo"),
Coin::new(1_000_000_000_000u128, "uatom"),
Coin::new(1_000_000_000_000u128, "uosmo"),
],
2,
)
Expand Down Expand Up @@ -111,8 +111,8 @@ let app = OsmosisTestApp::new();
let accs = app
.init_accounts(
&[
Coin::new(1_000_000_000_000, "uatom"),
Coin::new(1_000_000_000_000, "uosmo"),
Coin::new(1_000_000_000_000u128, "uatom"),
Coin::new(1_000_000_000_000u128, "uosmo"),
],
2,
)
Expand Down Expand Up @@ -170,8 +170,8 @@ let app = OsmosisTestApp::new();
let accs = app
.init_accounts(
&[
Coin::new(1_000_000_000_000, "uatom"),
Coin::new(1_000_000_000_000, "uosmo"),
Coin::new(1_000_000_000_000u128, "uatom"),
Coin::new(1_000_000_000_000u128, "uosmo"),
],
2,
)
Expand Down Expand Up @@ -254,16 +254,16 @@ use osmosis_test_tube::{Account, Module, OsmosisTestApp, Gamm};
let app = OsmosisTestApp::default();
let alice = app
.init_account(&[
Coin::new(1_000_000_000_000, "uatom"),
Coin::new(1_000_000_000_000, "uosmo"),
Coin::new(1_000_000_000_000u128, "uatom"),
Coin::new(1_000_000_000_000u128, "uosmo"),
])
.unwrap();

// create Gamm Module Wrapper
let gamm = Gamm::new(&app);

// create balancer pool with basic configuration
let pool_liquidity = vec![Coin::new(1_000, "uatom"), Coin::new(1_000, "uosmo")];
let pool_liquidity = vec![Coin::new(1_000u128, "uatom"), Coin::new(1_000u128, "uosmo")];
let pool_id = gamm
.create_basic_pool(&pool_liquidity, &alice)
.unwrap()
Expand Down
53 changes: 24 additions & 29 deletions packages/osmosis-test-tube/libosmosistesttube/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ module github.com/osmosis-labs/test-tube/osmosis-test-tube

go 1.21.4

toolchain go1.21.6
toolchain go1.22.3

require (
cosmossdk.io/errors v1.0.1
Expand All @@ -12,7 +12,7 @@ require (
github.com/cometbft/cometbft-db v0.11.0
github.com/cosmos/cosmos-sdk v0.47.8
github.com/cosmos/gogoproto v1.4.11
github.com/osmosis-labs/osmosis/v25 v25.0.0-20240430100100-f8586428a1d5
github.com/osmosis-labs/osmosis/v25 v25.0.0
github.com/pkg/errors v0.9.1
)

Expand Down Expand Up @@ -136,11 +136,11 @@ require (
github.com/mtibben/percent v0.2.1 // indirect
github.com/oasisprotocol/curve25519-voi v0.0.0-20220708102147-0a8a51822cae // indirect
github.com/opencontainers/go-digest v1.0.0 // indirect
github.com/osmosis-labs/osmosis/osmomath v0.0.12-0.20240423073233-246239a8f662 // indirect
github.com/osmosis-labs/osmosis/osmoutils v0.0.12-0.20240430090100-86b41c48fe1b // indirect
github.com/osmosis-labs/osmosis/x/epochs v0.0.8-0.20240423073233-246239a8f662 // indirect
github.com/osmosis-labs/osmosis/x/ibc-hooks v0.0.14-0.20240423073233-246239a8f662 // indirect
github.com/osmosis-labs/sqs/sqsdomain v0.0.0-20240429202838-7d69de2c9bea // indirect
github.com/osmosis-labs/osmosis/osmomath v0.0.13 // indirect
github.com/osmosis-labs/osmosis/osmoutils v0.0.13 // indirect
github.com/osmosis-labs/osmosis/x/epochs v0.0.9 // indirect
github.com/osmosis-labs/osmosis/x/ibc-hooks v0.0.15 // indirect
github.com/osmosis-labs/sqs/sqsdomain v0.18.1 // indirect
github.com/pelletier/go-toml/v2 v2.1.0 // indirect
github.com/petermattis/goid v0.0.0-20230518223814-80aa455d8761 // indirect
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
Expand Down Expand Up @@ -213,33 +213,28 @@ exclude github.com/cometbft/cometbft v0.38.0
// ## local replace
// replace github.com/osmosis-labs/osmosis/v23 => ../../../../osmosis

replace (
// adds expedited proposal support and 1000MB cache default
// https://github.com/osmosis-labs/wasmd/releases/tag/v0.45.0-osmo
github.com/CosmWasm/wasmd => github.com/osmosis-labs/wasmd v0.45.0-osmo
replace github.com/CosmWasm/wasmd => github.com/osmosis-labs/wasmd v0.45.0-osmo

// Using branch osmo-v24/v0.37.4
// https://github.com/osmosis-labs/cometbft/releases/tag/v0.37.4-v24-osmo-3
github.com/cometbft/cometbft => github.com/osmosis-labs/cometbft v0.37.4-v24-osmo-3
replace github.com/cometbft/cometbft => github.com/osmosis-labs/cometbft v0.37.4-v25-osmo-2

// v1.0.0-beta.3 is incompatible, so we use v1.0.0-beta.2
github.com/cosmos/cosmos-proto => github.com/cosmos/cosmos-proto v1.0.0-beta.2
replace github.com/cosmos/cosmos-proto => github.com/cosmos/cosmos-proto v1.0.0-beta.2

// Our cosmos-sdk branch is: https://github.com/osmosis-labs/cosmos-sdk/tree/osmo/v0.47.5, current branch: osmo/v0.47.5. Direct commit link: https://github.com/osmosis-labs/cosmos-sdk/commit/2384e2b96adf19abed82f7320da9ab314bcfba98
// https://github.com/osmosis-labs/cosmos-sdk/releases/tag/v0.47.5-v24-osmo-5
github.com/cosmos/cosmos-sdk => github.com/osmosis-labs/cosmos-sdk v0.47.5-v24-osmo-5
github.com/cosmos/gogoproto => github.com/cosmos/gogoproto v1.4.10
replace github.com/cosmos/cosmos-sdk => github.com/osmosis-labs/cosmos-sdk v0.47.5-v25-osmo-1

github.com/cosmos/iavl => github.com/cosmos/iavl v1.1.2-0.20240405172238-7f92c6b356ac
github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1
replace github.com/cosmos/gogoproto => github.com/cosmos/gogoproto v1.4.10

// github.com/osmosis-labs/osmosis/v25 => github.com/osmosis-labs/osmosis/v25 v24.0.0-20240430090414-94186950dcf2
replace github.com/cosmos/iavl => github.com/cosmos/iavl v1.1.2-0.20240405172238-7f92c6b356ac

github.com/osmosis-labs/sqs/sqsdomain => github.com/osmosis-labs/sqs/sqsdomain v0.0.0-20240429202838-7d69de2c9bea
replace github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1

// replace as directed by sdk upgrading.md https://github.com/cosmos/cosmos-sdk/blob/393de266c8675dc16cc037c1a15011b1e990975f/UPGRADING.md?plain=1#L713
github.com/syndtr/goleveldb => github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7
replace github.com/osmosis-labs/sqs/sqsdomain => github.com/osmosis-labs/sqs/sqsdomain v0.18.1

// newer versions of exp treat sorting differently, which is incompatible with the current version of cosmos-sdk
golang.org/x/exp => golang.org/x/exp v0.0.0-20230711153332-06a737ee72cb
)
replace github.com/syndtr/goleveldb => github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7

replace golang.org/x/exp => golang.org/x/exp v0.0.0-20230711153332-06a737ee72cb

replace github.com/osmosis-labs/osmosis/osmomath => github.com/osmosis-labs/osmosis/osmomath v0.0.13

replace github.com/osmosis-labs/osmosis/osmoutils => github.com/osmosis-labs/osmosis/osmoutils v0.0.13

replace github.com/osmosis-labs/osmosis/x/ibc-hooks => github.com/osmosis-labs/osmosis/x/ibc-hooks v0.0.15
32 changes: 16 additions & 16 deletions packages/osmosis-test-tube/libosmosistesttube/go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1239,22 +1239,22 @@ github.com/openzipkin/zipkin-go v0.2.1/go.mod h1:NaW6tEwdmWMaCDZzg8sh+IBNOxHMPnh
github.com/openzipkin/zipkin-go v0.2.2/go.mod h1:NaW6tEwdmWMaCDZzg8sh+IBNOxHMPnhQw8ySjnjRyN4=
github.com/ory/dockertest v3.3.5+incompatible h1:iLLK6SQwIhcbrG783Dghaaa3WPzGc+4Emza6EbVUUGA=
github.com/ory/dockertest v3.3.5+incompatible/go.mod h1:1vX4m9wsvi00u5bseYwXaSnhNrne+V0E6LAcBILJdPs=
github.com/osmosis-labs/cometbft v0.37.4-v24-osmo-3 h1:mkfU9Hba3vAgGyjXGyATRUzfCT69VLlw9LJmY6aawzs=
github.com/osmosis-labs/cometbft v0.37.4-v24-osmo-3/go.mod h1:p8RohShfTfbvSzgb9zFnqvtCgyLTzqA8otk0I/YDbSg=
github.com/osmosis-labs/cosmos-sdk v0.47.5-v24-osmo-5 h1:fnt89Cw+55vbnIEGkpCmj0cx/EaEnwHfYi4JN3rKkLU=
github.com/osmosis-labs/cosmos-sdk v0.47.5-v24-osmo-5/go.mod h1:eSRUVYwL3eG1jnh01CnBbHiqOM3xJO49p5rTOrSFX1k=
github.com/osmosis-labs/osmosis/osmomath v0.0.12-0.20240423073233-246239a8f662 h1:P6deXtGtSXJgPtvo6f/1vAQgF38HUsrIT6Mq7LMGYrs=
github.com/osmosis-labs/osmosis/osmomath v0.0.12-0.20240423073233-246239a8f662/go.mod h1:ubFhAjLis9cH6GPIhaCjf4JdXrn8HBBOxvOYMxPtgSM=
github.com/osmosis-labs/osmosis/osmoutils v0.0.12-0.20240430090100-86b41c48fe1b h1:VT4eKfFkL9FxuVAO05I06z6Wp6sD99eB7z1ZzaqoMF0=
github.com/osmosis-labs/osmosis/osmoutils v0.0.12-0.20240430090100-86b41c48fe1b/go.mod h1:sHrm1JXicWHDt74cJavXKe19OWongf/kiVX9SBI+Dec=
github.com/osmosis-labs/osmosis/v25 v25.0.0-20240430100100-f8586428a1d5 h1:HYD7dXKzPXraDxzMcCRETE37Pc9zpnm5aPDB9UA0w0w=
github.com/osmosis-labs/osmosis/v25 v25.0.0-20240430100100-f8586428a1d5/go.mod h1:UR3iCTfac3mSMT5QnIVOh2UMh0WA6Qa8ZroY48NPejI=
github.com/osmosis-labs/osmosis/x/epochs v0.0.8-0.20240423073233-246239a8f662 h1:bG3Fll3ryw+yo+70u0oOUjxq1SZ2GgTRDgmivZEdPKE=
github.com/osmosis-labs/osmosis/x/epochs v0.0.8-0.20240423073233-246239a8f662/go.mod h1:3BTKszIZFP/3ut/sW0izJOZRNDXWINU5zfZGo+a8QhE=
github.com/osmosis-labs/osmosis/x/ibc-hooks v0.0.14-0.20240423073233-246239a8f662 h1:1GiW1IDHH6BfmBYdP5YGnS+TkO6ZKKVzSFccG9RH9gA=
github.com/osmosis-labs/osmosis/x/ibc-hooks v0.0.14-0.20240423073233-246239a8f662/go.mod h1:VBMzVCCaiVJokiQ+6+O6KAU9XaH656o6kCeHoVCiTL8=
github.com/osmosis-labs/sqs/sqsdomain v0.0.0-20240429202838-7d69de2c9bea h1:jcwN05LSSV7Vdp+FHp3WtabuFtBb7l+ki4O5R2P1Sr4=
github.com/osmosis-labs/sqs/sqsdomain v0.0.0-20240429202838-7d69de2c9bea/go.mod h1:d3wAamev0J2ABDeUvCDTUnw0mMrraXRia1e/dqq/xFI=
github.com/osmosis-labs/cometbft v0.37.4-v25-osmo-2 h1:sEYLujiwT2rMRQVtZbYhEEj8rRGPxszdoqTANqaP3YQ=
github.com/osmosis-labs/cometbft v0.37.4-v25-osmo-2/go.mod h1:p8RohShfTfbvSzgb9zFnqvtCgyLTzqA8otk0I/YDbSg=
github.com/osmosis-labs/cosmos-sdk v0.47.5-v25-osmo-1 h1:l1Hk4DGxDoBe1YUb7IbwRz/CbzA3wfQZ+j+vz+ed5tM=
github.com/osmosis-labs/cosmos-sdk v0.47.5-v25-osmo-1/go.mod h1:eSRUVYwL3eG1jnh01CnBbHiqOM3xJO49p5rTOrSFX1k=
github.com/osmosis-labs/osmosis/osmomath v0.0.13 h1:BqOlG9SxHn8D4RmCbeF4Cg4/2FUobFe+QNxflRTM4QA=
github.com/osmosis-labs/osmosis/osmomath v0.0.13/go.mod h1:eEvmkFLKy1h+EKTr2rhFpmLu4solO3XG0jZt10VSCSI=
github.com/osmosis-labs/osmosis/osmoutils v0.0.13 h1:+9EGL5dSL6JH2AD1TiJ+zhkqcwhtg8hPzAPvcjSpQeU=
github.com/osmosis-labs/osmosis/osmoutils v0.0.13/go.mod h1:lMdKRtlQQk3hOdt/HHrcKnCm3LhxR7PP2/jHFktfiUI=
github.com/osmosis-labs/osmosis/v25 v25.0.0 h1:ukQDYl3zZNI+lIFFlTr/qdpCzg4cm27+o0nFWdhF9Mc=
github.com/osmosis-labs/osmosis/v25 v25.0.0/go.mod h1:CwYI7YMeoiQmpe0OTjJBuwcgfHdtGuijUxDcOoY/XAM=
github.com/osmosis-labs/osmosis/x/epochs v0.0.9 h1:KKNMuoGlGv3yxmh+hF5yIqjYbxjXW8vBDFiCIfZcn78=
github.com/osmosis-labs/osmosis/x/epochs v0.0.9/go.mod h1:jROhCibKGjWW1IyPaCFUIEJ9P25S0VawgIpWRxcqYqQ=
github.com/osmosis-labs/osmosis/x/ibc-hooks v0.0.15 h1:bUBZwiMibgQWQQSqyMPqj0p54hpsDwbkCpNROWdWYJk=
github.com/osmosis-labs/osmosis/x/ibc-hooks v0.0.15/go.mod h1:c72yyA6FvQNgOm/NxQuDXQfRpYy2JCJpf1o+G4kFuyM=
github.com/osmosis-labs/sqs/sqsdomain v0.18.1 h1:+jF8VoDUwViU4V8IpkZuuIr7/dc+BqFmxa2j8bx5Khk=
github.com/osmosis-labs/sqs/sqsdomain v0.18.1/go.mod h1:zIr5aJJuPrh/O4C/6ehpdrl1VT6Hs0yjAVP6f/vFJuc=
github.com/osmosis-labs/wasmd v0.45.0-osmo h1:NIp7pvJV5HuBN1HwPgEmXKQM2TjVIVdJErIHnB9IMO8=
github.com/osmosis-labs/wasmd v0.45.0-osmo/go.mod h1:J6eRvwii5T1WxhetZkBg1kOJS3GTn1Bw2OLyZBb8EVU=
github.com/pact-foundation/pact-go v1.0.4/go.mod h1:uExwJY4kCzNPcHRj+hCR/HBbOOIwwtUjcrb0b5/5kLM=
Expand Down
2 changes: 1 addition & 1 deletion packages/osmosis-test-tube/osmosis
Submodule osmosis updated 1327 files
1 change: 1 addition & 0 deletions packages/osmosis-test-tube/src/module/authz.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@ mod tests {
amount: 10u128.to_string(),
denom: "usdc".to_string(),
}],
allow_list: vec![],
},
&mut buf,
)
Expand Down
6 changes: 3 additions & 3 deletions packages/osmosis-test-tube/src/module/concentrated_liquidity.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -107,10 +107,10 @@ mod tests {
fn test_concentrated_liquidity() {
let app = OsmosisTestApp::new();
let signer = app
.init_account(&[Coin::new(10_000_000_000, "uosmo")])
.init_account(&[Coin::new(10_000_000_000u128, "uosmo")])
.unwrap()
.with_fee_setting(test_tube::account::FeeSetting::Auto {
gas_price: Coin::new(25, "uosmo"),
gas_price: Coin::new(25u128, "uosmo"),
gas_adjustment: 1.2,
});

Expand All @@ -136,7 +136,7 @@ mod tests {
.mint(
MsgMint {
sender: signer.address(),
amount: Some(Coin::new(100_000_000_000, &denom0).into()),
amount: Some(Coin::new(100_000_000_000u128, &denom0).into()),
mint_to_address: signer.address(),
},
&signer,
Expand Down
2 changes: 1 addition & 1 deletion packages/osmosis-test-tube/src/module/gov.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ mod tests {
let gov = GovWithAppAccess::new(&app);

let proposer = app
.init_account(&[cosmwasm_std::Coin::new(1000000000000000000, "uosmo")])
.init_account(&[cosmwasm_std::Coin::new(1000000000000000000u128, "uosmo")])
.unwrap();

// upload cosmwasm pool code and whitelist through proposal
Expand Down
16 changes: 8 additions & 8 deletions packages/osmosis-test-tube/src/module/pool_manager.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -117,10 +117,10 @@ mod tests {
fn test_pool_manager() {
let app = OsmosisTestApp::new();
let signer = app
.init_account(&[Coin::new(1_000_000_000_000_000, "uosmo")])
.init_account(&[Coin::new(1_000_000_000_000_000u128, "uosmo")])
.unwrap()
.with_fee_setting(test_tube::account::FeeSetting::Auto {
gas_price: Coin::new(25, "uosmo"),
gas_price: Coin::new(25u128, "uosmo"),
gas_adjustment: 1.2,
});

Expand Down Expand Up @@ -160,7 +160,7 @@ mod tests {
.mint(
MsgMint {
sender: signer.address(),
amount: Some(Coin::new(10_000_000_000_000, &denom0).into()),
amount: Some(Coin::new(10_000_000_000_000u128, &denom0).into()),
mint_to_address: signer.address(),
},
&signer,
Expand All @@ -171,7 +171,7 @@ mod tests {
.mint(
MsgMint {
sender: signer.address(),
amount: Some(Coin::new(100_000_000_000, &denom1).into()),
amount: Some(Coin::new(100_000_000_000u128, &denom1).into()),
mint_to_address: signer.address(),
},
&signer,
Expand All @@ -181,8 +181,8 @@ mod tests {
// create pool 1
gamm.create_basic_pool(
&[
Coin::new(1_000_000_000, denom0.clone()),
Coin::new(2_000_000_000, denom1.clone()),
Coin::new(1_000_000_000u128, denom0.clone()),
Coin::new(2_000_000_000u128, denom1.clone()),
],
&signer,
)
Expand Down Expand Up @@ -279,8 +279,8 @@ mod tests {
// swap amount in
let trader = app
.init_account(&[
Coin::new(1_000_000_000, denom0.clone()),
Coin::new(1_000_000_000, "uosmo".to_string()),
Coin::new(1_000_000_000u128, denom0.clone()),
Coin::new(1_000_000_000u128, "uosmo".to_string()),
])
.unwrap();

Expand Down
4 changes: 2 additions & 2 deletions packages/osmosis-test-tube/src/module/tokenfactory.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ mod tests {
fn tokenfactory_integration() {
let app = OsmosisTestApp::new();
let signer = app
.init_account(&[Coin::new(2_000_000_000_000, "uosmo")])
.init_account(&[Coin::new(2_000_000_000_000u128, "uosmo")])
.unwrap();
let tokenfactory = TokenFactory::new(&app);
let bank = Bank::new(&app);
Expand Down Expand Up @@ -106,7 +106,7 @@ mod tests {

// mint
let coin: osmosis_std::types::cosmos::base::v1beta1::Coin =
Coin::new(1000000000, denom.clone()).into();
Coin::new(1000000000u128, denom.clone()).into();
tokenfactory
.mint(
MsgMint {
Expand Down
12 changes: 6 additions & 6 deletions packages/osmosis-test-tube/src/module/twap.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,10 +56,10 @@ mod tests {
fn test_twap() {
let app = OsmosisTestApp::new();
let signer = app
.init_account(&[Coin::new(1_000_000_000_000_000, "uosmo")])
.init_account(&[Coin::new(1_000_000_000_000_000u128, "uosmo")])
.unwrap()
.with_fee_setting(test_tube::account::FeeSetting::Auto {
gas_price: Coin::new(25, "uosmo"),
gas_price: Coin::new(25u128, "uosmo"),
gas_adjustment: 1.2,
});

Expand Down Expand Up @@ -98,7 +98,7 @@ mod tests {
.mint(
MsgMint {
sender: signer.address(),
amount: Some(Coin::new(10_000_000_000_000, &denom0).into()),
amount: Some(Coin::new(10_000_000_000_000u128, &denom0).into()),
mint_to_address: signer.address(),
},
&signer,
Expand All @@ -109,7 +109,7 @@ mod tests {
.mint(
MsgMint {
sender: signer.address(),
amount: Some(Coin::new(100_000_000_000, &denom1).into()),
amount: Some(Coin::new(100_000_000_000u128, &denom1).into()),
mint_to_address: signer.address(),
},
&signer,
Expand All @@ -119,8 +119,8 @@ mod tests {
// create pool 1
gamm.create_basic_pool(
&[
Coin::new(1_000_000_000, denom0.clone()),
Coin::new(2_000_000_000, denom1.clone()),
Coin::new(1_000_000_000u128, denom0.clone()),
Coin::new(2_000_000_000u128, denom1.clone()),
],
&signer,
)
Expand Down
Loading

0 comments on commit 4dc62d8

Please sign in to comment.