Add integration tests and prop tests for Osmosis #95

pacmanifold · 2022-11-30T15:04:08Z

Update CI workflows to match new workspace structure
Fix so that wasm build only builds the contract
- Run with cargo make wasm
Update all the dependencies to not use local versions

Closes #114

Signed-off-by: Bobby <[email protected]>

The advisory RUSTSEC-2020-0071 (alias RUSTSEC-2020-26235) does not apply to the `time` dependency in `chrono`, which is a dependency of `osmosis-std`. After some investigation it seems the advisory can safely be ignored, but care must be taken that it is not ignored for any other crates, should it appear anywhere else. Signed-off-by: Bobby <[email protected]>

apollo-bobby

I have added an ignore rule for RUSTSEC-2020-0071, which was incorrectly causing cargo deny to report a vulnerability for the chrono dependency in osmosis-std. Please see my latest commit message for some more details.
We must take care to not ignore this in the future if it resurfaces.

apollo-sturdy

Nice work! Approving, but see comments. Could be nice to clarify some stuff.

apollo-sturdy · 2023-01-10T10:07:27Z

Cargo.toml

+cw-storage-plus = "0.15.1"
+cw2 = "0.15.1"


Let's update to >= 1.0

apollo-sturdy · 2023-01-10T10:36:35Z

cw-dex/Cargo.toml

+cw-utils = "0.16"
+cw20 = "0.16"


why not using workspace version?

apollo-sturdy · 2023-01-10T10:44:14Z

test-helpers/src/helpers.rs

+) {
+    let (funds, _) = separate_natives_and_cw20s(&assets);
+
+    // TODO: Increase allowance for cw20 assets


Todo comment for when we do astroport tests or? Lets not leave TODO comments, instead mention it in the relevant issue.

apollo-sturdy · 2023-01-10T10:44:54Z

test-helpers/Cargo.toml

+cw-asset = { workspace = true }
+osmosis-testing = { workspace = true }
+osmosis-std = { workspace = true }
+apollo-utils = { git = "https://github.com/apollodao/apollo-utils.git", rev = "bfd1abd8cd9716dccad3e74aeb3704cad9f1f41a" }


why no workspace dep here?

it depends on a specific version to have the same version of cw-asset but cw-dex uses a function from a later commit. #118

apollo-sturdy · 2023-01-10T10:48:12Z

cw-dex/tests/configs/osmosis.yaml

@@ -0,0 +1,31 @@
+folder: "./tests/configs"


Should we remove configs folder until we add support for testcontainers?

apollo-sturdy · 2023-01-10T11:41:14Z

.github/workflows/test.yml

@@ -39,6 +26,30 @@ jobs:
        uses: actions-rs/cargo@v1
        with:
          command: test
-          args: --locked --all-features
+          args: --locked --lib


Why remove --all-features? Are there no unit tests in feature gated modules we want to test?

apollo-sturdy · 2023-01-10T11:42:24Z

cw-dex/tests/osmosis_tests.rs

+        Ok(())
+    }
+
+    // TODO: For some reason it fails when swap amount is 1. Need to investigate


Either fix i this PR or open an issue and remove comment.

apollo-sturdy · 2023-01-10T11:45:48Z

cw-dex/tests/osmosis_proptests.rs

+    )
+}
+
+fn test_multi_pool_provide_liquidity(


Add doc comment

Why called multi_pool? What is multi?

apollo-sturdy · 2023-01-10T11:48:40Z

cw-dex/tests/osmosis_proptests.rs

+        ask_idx
+    };
+
+    // Offer amount cannot be larger than the pool liquidity


Why not? Getting a weird error? :p
Had the same issue in my tests, but on testnet it works fine...

Maybe clarify the comment for those who aren't aware of this bug(?).

yeah getting some error from osmosis

apollo-sturdy · 2023-01-10T11:51:32Z

cw-dex/tests/osmosis_proptests.rs

+        // Setting both fork and timeout is redundant since timeout implies
+        // fork, but both are shown for clarity.


Outdated comment? Don't see mention of "timeout" nor "fork" anywhere.

pacmanifold · 2023-01-25T20:13:26Z

Addressed comments and opened a new PR containing only the osmosis tests here #116

Lets merge that in first since it is the most important and then rebase the astroport tests later

apollo-sturdy · 2023-02-13T18:51:36Z

Closing in favor of #116 and #125

pacmanifold force-pushed the test/integration-tests branch 2 times, most recently from 9bfb8c6 to 188632d Compare December 20, 2022 16:10

pacmanifold changed the title ~~wip: integration tests~~ Integration tests and prop tests Dec 21, 2022

pacmanifold force-pushed the test/integration-tests branch from 21596be to 188632d Compare December 21, 2022 11:12

pacmanifold changed the title ~~Integration tests and prop tests~~ Add integration tests and prop tests Dec 21, 2022

pacmanifold added 7 commits December 21, 2022 18:41

test: setup integration tests and prop tests

4d7edd2

chore: run cargo fmt

c4ddfb2

chore: update dependencies

cc79635

chore: fix clippy warnings

8c130f1

chore: remove unused dependencies

b27c2c2

ci: update Makefile.toml for workspace

990d99d

ci: add wasm task to Makefile.toml

d829594

pacmanifold force-pushed the test/integration-tests branch from d310ac1 to d829594 Compare December 21, 2022 17:41

pacmanifold changed the title ~~Add integration tests and prop tests~~ Add integration tests and prop tests for Osmosis Dec 21, 2022

pacmanifold added 3 commits December 21, 2022 19:25

refactor: setup structure for multiple test contracts

45a1c3a

refactor: update cargo make wasm task

0b7ae3d

test: fix tests after rebase

40698d5

apollo-sturdy mentioned this pull request Dec 22, 2022

Double check that ci is done #113

Closed

pacmanifold added 5 commits December 22, 2022 16:19

refactor: rename osmosis integration tests file

0cfaffa

ci: run UTs, ITs, and prop tests separately

8f4be96

fix: remove backtrace feature from test contract

25639ca

chore: run cargo clippy

26be32f

chore: remove unused dep

cbad092

pacmanifold force-pushed the test/integration-tests branch 3 times, most recently from 9142611 to 4c6307c Compare December 22, 2022 15:58

ci: update ci

e325ec4

pacmanifold force-pushed the test/integration-tests branch from 4c6307c to e325ec4 Compare December 22, 2022 16:21

pacmanifold added 2 commits December 22, 2022 17:40

chore: run cargo fmt

5352ae0

chore: update licenses

0030339

pacmanifold and others added 6 commits December 22, 2022 17:52

ci: update cargo deny config

4ae1801

chore: update Cargo.lock

5d40c3b

ci: fix deny.toml config failing on CI

10431c6

Signed-off-by: Bobby <[email protected]>

ci: Add manual trigger to licenses workflow

d33c02e

Signed-off-by: Bobby <[email protected]>

ci: Add manual triggers to all workflows

64f5a1f

Signed-off-by: Bobby <[email protected]>

apollo-bobby reviewed Jan 5, 2023

View reviewed changes

apollo-sturdy previously approved these changes Jan 10, 2023

View reviewed changes

georgemc98 added 2 commits January 17, 2023 19:18

test: add astroport tests

fb4ba41

test: add tests, artifacts, and test-contract

f078708

georgemc98 dismissed apollo-sturdy’s stale review via f078708 January 18, 2023 01:19

chore: remove astroport from default

6dc597a

This was referenced Jan 25, 2023

Support CW20 assets in provide_liquidity in test_helpers.rs #117

Open

Use only one version of apollo-utils in the workspace #118

Closed

Investigate why swapping fails with amount Uint128::one() #119

Open

apollo-sturdy closed this Feb 13, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add integration tests and prop tests for Osmosis #95

Add integration tests and prop tests for Osmosis #95

pacmanifold commented Nov 30, 2022 •

edited

Loading

apollo-bobby left a comment

apollo-sturdy left a comment

apollo-sturdy Jan 10, 2023

pacmanifold Jan 25, 2023

apollo-sturdy Jan 10, 2023

pacmanifold Jan 25, 2023

apollo-sturdy Jan 10, 2023

pacmanifold Jan 25, 2023

apollo-sturdy Jan 10, 2023

pacmanifold Jan 25, 2023

apollo-sturdy Jan 10, 2023

pacmanifold Jan 25, 2023

apollo-sturdy Jan 10, 2023

pacmanifold Jan 25, 2023

apollo-sturdy Jan 10, 2023

pacmanifold Jan 25, 2023

apollo-sturdy Jan 10, 2023

apollo-sturdy Jan 10, 2023

pacmanifold Jan 25, 2023

apollo-sturdy Jan 10, 2023

apollo-sturdy Jan 10, 2023

pacmanifold Jan 25, 2023

apollo-sturdy Jan 10, 2023

pacmanifold Jan 25, 2023

pacmanifold commented Jan 25, 2023 •

edited

Loading

apollo-sturdy commented Feb 13, 2023

		// Setting both fork and timeout is redundant since timeout implies
		// fork, but both are shown for clarity.

		cw-storage-plus = "0.15.1"
		cw2 = "0.15.1"

Add integration tests and prop tests for Osmosis #95

Add integration tests and prop tests for Osmosis #95

Conversation

pacmanifold commented Nov 30, 2022 • edited Loading

apollo-bobby left a comment

Choose a reason for hiding this comment

apollo-sturdy left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

pacmanifold commented Jan 25, 2023 • edited Loading

apollo-sturdy commented Feb 13, 2023

pacmanifold commented Nov 30, 2022 •

edited

Loading

pacmanifold commented Jan 25, 2023 •

edited

Loading