diff --git a/.github/workflows/coins-tests.yml b/.github/workflows/coins-tests.yml index f94e9fd5..e4a3e75b 100644 --- a/.github/workflows/coins-tests.yml +++ b/.github/workflows/coins-tests.yml @@ -32,5 +32,19 @@ jobs: -p bitcoin-serai \ -p alloy-simple-request-transport \ -p ethereum-serai \ + -p monero-io \ -p monero-generators \ - -p monero-serai + -p monero-primitives \ + -p monero-mlsag \ + -p monero-clsag \ + -p monero-borromean \ + -p monero-bulletproofs \ + -p monero-serai \ + -p monero-rpc \ + -p monero-simple-request-rpc \ + -p monero-address \ + -p monero-wallet \ + -p monero-seed \ + -p polyseed \ + -p monero-wallet-util \ + -p monero-serai-verify-chain diff --git a/.github/workflows/monero-tests.yaml b/.github/workflows/monero-tests.yaml index 3f2127ce..f258d232 100644 --- a/.github/workflows/monero-tests.yaml +++ b/.github/workflows/monero-tests.yaml @@ -26,7 +26,23 @@ jobs: uses: ./.github/actions/test-dependencies - name: Run Unit Tests Without Features - run: GITHUB_CI=true RUST_BACKTRACE=1 cargo test --package monero-serai --lib + run: | + GITHUB_CI=true RUST_BACKTRACE=1 cargo test --package monero-io --lib + GITHUB_CI=true RUST_BACKTRACE=1 cargo test --package monero-generators --lib + GITHUB_CI=true RUST_BACKTRACE=1 cargo test --package monero-primitives --lib + GITHUB_CI=true RUST_BACKTRACE=1 cargo test --package monero-mlsag --lib + GITHUB_CI=true RUST_BACKTRACE=1 cargo test --package monero-clsag --lib + GITHUB_CI=true RUST_BACKTRACE=1 cargo test --package monero-borromean --lib + GITHUB_CI=true RUST_BACKTRACE=1 cargo test --package monero-bulletproofs --lib + GITHUB_CI=true RUST_BACKTRACE=1 cargo test --package monero-serai --lib + GITHUB_CI=true RUST_BACKTRACE=1 cargo test --package monero-rpc --lib + GITHUB_CI=true RUST_BACKTRACE=1 cargo test --package monero-simple-request-rpc --lib + GITHUB_CI=true RUST_BACKTRACE=1 cargo test --package monero-address --lib + GITHUB_CI=true RUST_BACKTRACE=1 cargo test --package monero-wallet --lib + GITHUB_CI=true RUST_BACKTRACE=1 cargo test --package monero-seed --lib + GITHUB_CI=true RUST_BACKTRACE=1 cargo test --package polyseed --lib + GITHUB_CI=true RUST_BACKTRACE=1 cargo test --package monero-wallet-util --lib + GITHUB_CI=true RUST_BACKTRACE=1 cargo test --package monero-serai-verify-chain --lib # Doesn't run unit tests with features as the tests workflow will @@ -46,11 +62,17 @@ jobs: monero-version: ${{ matrix.version }} - name: Run Integration Tests Without Features - # Runs with the binaries feature so the binaries build - # https://github.com/rust-lang/cargo/issues/8396 - run: GITHUB_CI=true RUST_BACKTRACE=1 cargo test --package monero-serai --features binaries --test '*' + run: | + GITHUB_CI=true RUST_BACKTRACE=1 cargo test --package monero-serai --test '*' + GITHUB_CI=true RUST_BACKTRACE=1 cargo test --package monero-wallet --test '*' + GITHUB_CI=true RUST_BACKTRACE=1 cargo test --package monero-wallet-util --test '*' + GITHUB_CI=true RUST_BACKTRACE=1 cargo test --package monero-serai-verify-chain --test '*' - name: Run Integration Tests # Don't run if the the tests workflow also will if: ${{ matrix.version != 'v0.18.2.0' }} - run: GITHUB_CI=true RUST_BACKTRACE=1 cargo test --package monero-serai --all-features --test '*' + run: | + GITHUB_CI=true RUST_BACKTRACE=1 cargo test --package monero-serai --all-features --test '*' + GITHUB_CI=true RUST_BACKTRACE=1 cargo test --package monero-wallet --all-features --test '*' + GITHUB_CI=true RUST_BACKTRACE=1 cargo test --package monero-wallet-util --all-features --test '*' + GITHUB_CI=true RUST_BACKTRACE=1 cargo test --package monero-serai-verify-chain --test '*' diff --git a/Cargo.lock b/Cargo.lock index 20440b43..28bbfbd8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4895,7 +4895,6 @@ dependencies = [ "monero-io", "monero-mlsag", "monero-primitives", - "rand_core", "std-shims", "zeroize", ] @@ -4912,7 +4911,6 @@ dependencies = [ "rand_core", "serde", "serde_json", - "std-shims", "tokio", ] diff --git a/coins/monero/Cargo.toml b/coins/monero/Cargo.toml index 08df9a35..ae38dabf 100644 --- a/coins/monero/Cargo.toml +++ b/coins/monero/Cargo.toml @@ -19,7 +19,6 @@ workspace = true std-shims = { path = "../../common/std-shims", version = "^0.1.1", default-features = false } zeroize = { version = "^1.5", default-features = false, features = ["zeroize_derive"] } -rand_core = { version = "0.6", default-features = false } curve25519-dalek = { version = "4", default-features = false, features = ["alloc", "zeroize"] } @@ -38,13 +37,13 @@ std = [ "std-shims/std", "zeroize/std", - "rand_core/std", "monero-io/std", "monero-generators/std", "monero-primitives/std", "monero-mlsag/std", "monero-clsag/std", + "monero-borromean/std", "monero-bulletproofs/std", ] diff --git a/coins/monero/verify-chain/Cargo.toml b/coins/monero/verify-chain/Cargo.toml index d6a19a9f..ce2f2861 100644 --- a/coins/monero/verify-chain/Cargo.toml +++ b/coins/monero/verify-chain/Cargo.toml @@ -7,6 +7,7 @@ repository = "https://github.com/serai-dex/serai/tree/develop/coins/monero/verif authors = ["Luke Parker "] edition = "2021" rust-version = "1.79" +publish = false [package.metadata.docs.rs] all-features = true @@ -16,8 +17,6 @@ rustdoc-args = ["--cfg", "docsrs"] workspace = true [dependencies] -std-shims = { path = "../../../common/std-shims", version = "^0.1.1", default-features = false } - rand_core = { version = "0.6", default-features = false, features = ["std"] } curve25519-dalek = { version = "4", default-features = false, features = ["alloc", "zeroize"] } diff --git a/coins/monero/verify-chain/src/main.rs b/coins/monero/verify-chain/src/main.rs index 41a212c4..84539606 100644 --- a/coins/monero/verify-chain/src/main.rs +++ b/coins/monero/verify-chain/src/main.rs @@ -248,7 +248,8 @@ async fn main() { let args = std::env::args().collect::>(); // Read start block as the first arg - let mut block_i = args.get(1).expect("no start block specified").parse::().expect("invalid start block"); + let mut block_i = + args.get(1).expect("no start block specified").parse::().expect("invalid start block"); // How many blocks to work on at once let async_parallelism: usize =