From 393350f8df77bf133a1d09af163adba70c121c9b Mon Sep 17 00:00:00 2001 From: ngutech21 Date: Fri, 8 Mar 2024 13:45:26 +0100 Subject: [PATCH] fix: install docker-compose in gh-action --- .github/workflows/rust.yml | 8 ++++ Cargo.lock | 95 ++------------------------------------ Cargo.toml | 1 - 3 files changed, 12 insertions(+), 92 deletions(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index ac6b266f..314a4279 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -16,10 +16,18 @@ jobs: - uses: actions/checkout@v4 - name: Install protobuf-compiler run: sudo apt-get update && sudo apt-get install -y protobuf-compiler + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v3 + - name: Install just + run: cargo install just + - name: Run Docker Compose + run: docker compose up lnd1 -d - name: Build run: cargo build --verbose - name: Run tests run: cargo test --verbose + - name: Run itests + run: just run-itests coverage: runs-on: ubuntu-latest name: coverage diff --git a/Cargo.lock b/Cargo.lock index 824272cb..ac20a3f2 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -320,19 +320,13 @@ version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d86b93f97252c47b41663388e6d155714a9d0c398b99f1005cbc5f978b29f445" -[[package]] -name = "bech32" -version = "0.10.0-beta" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98f7eed2b2781a6f0b5c903471d48e15f56fb4e1165df8a9a2337fd1a59d45ea" - [[package]] name = "bitcoin" version = "0.29.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0694ea59225b0c5f3cb405ff3f670e4828358ed26aec49dc352f730f0cb1a8a3" dependencies = [ - "bech32 0.9.1", + "bech32", "bitcoin_hashes 0.11.0", "secp256k1 0.24.3", ] @@ -343,7 +337,7 @@ version = "0.30.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1945a5048598e4189e239d3f809b19bdad4845c4b2ba400d304d2dcf26d2c462" dependencies = [ - "bech32 0.9.1", + "bech32", "bitcoin-private", "bitcoin_hashes 0.12.0", "hex_lit", @@ -351,29 +345,11 @@ dependencies = [ "serde", ] -[[package]] -name = "bitcoin" -version = "0.31.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd00f3c09b5f21fb357abe32d29946eb8bb7a0862bae62c0b5e4a692acbbe73c" -dependencies = [ - "bech32 0.10.0-beta", - "bitcoin-internals", - "bitcoin_hashes 0.13.0", - "hex-conservative", - "hex_lit", - "secp256k1 0.28.2", - "serde", -] - [[package]] name = "bitcoin-internals" version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9425c3bf7089c983facbae04de54513cce73b41c7f9ff8c845b54e7bc64ebbfb" -dependencies = [ - "serde", -] [[package]] name = "bitcoin-private" @@ -405,31 +381,6 @@ checksum = "1930a4dabfebb8d7d9992db18ebe3ae2876f0a305fab206fd168df931ede293b" dependencies = [ "bitcoin-internals", "hex-conservative", - "serde", -] - -[[package]] -name = "bitcoincore-rpc" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8eb70725a621848c83b3809913d5314c0d20ca84877d99dd909504b564edab00" -dependencies = [ - "bitcoincore-rpc-json", - "jsonrpc", - "log", - "serde", - "serde_json", -] - -[[package]] -name = "bitcoincore-rpc-json" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "856ffbee2e492c23bca715d72ea34aae80d58400f2bda26a82015d6bc2ec3662" -dependencies = [ - "bitcoin 0.31.1", - "serde", - "serde_json", ] [[package]] @@ -1542,17 +1493,6 @@ dependencies = [ "wasm-bindgen", ] -[[package]] -name = "jsonrpc" -version = "0.14.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8128f36b47411cd3f044be8c1f5cc0c9e24d1d1bfdc45f0a57897b32513053f2" -dependencies = [ - "base64 0.13.1", - "serde", - "serde_json", -] - [[package]] name = "lazy_static" version = "1.4.0" @@ -1621,7 +1561,7 @@ version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3eb24878b0f4ef75f020976c886d9ad1503867802329cc963e0ab4623ea3b25c" dependencies = [ - "bech32 0.9.1", + "bech32", "bitcoin 0.29.2", "bitcoin_hashes 0.11.0", "lightning 0.0.118", @@ -1635,7 +1575,7 @@ version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5b186aca4a605d4db3b85979922be287b9ebd5dedd8132963bb9dbeb8f7d2a04" dependencies = [ - "bech32 0.9.1", + "bech32", "bitcoin 0.30.2", "lightning 0.0.121", "num-traits", @@ -1800,31 +1740,6 @@ dependencies = [ "uuid", ] -[[package]] -name = "moksha-integrationtests" -version = "0.2.1" -dependencies = [ - "anyhow", - "axum 0.7.4", - "bitcoin_hashes 0.12.0", - "bitcoincore-rpc", - "fedimint-tonic-lnd", - "lightning-invoice 0.29.0", - "moksha-core", - "moksha-mint", - "moksha-wallet", - "rand", - "reqwest", - "secp256k1 0.27.0", - "serde", - "tempfile", - "testcontainers", - "testcontainers-modules", - "tokio", - "tracing", - "url", -] - [[package]] name = "moksha-mint" version = "0.2.1" @@ -2886,7 +2801,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "25996b82292a7a57ed3508f052cfff8640d38d32018784acd714758b43da9c8f" dependencies = [ "bitcoin_hashes 0.12.0", - "rand", "secp256k1-sys 0.8.1", "serde", ] @@ -2897,7 +2811,6 @@ version = "0.28.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d24b59d129cdadea20aea4fb2352fa053712e5d713eee47d700cd4b2bc002f10" dependencies = [ - "bitcoin_hashes 0.13.0", "rand", "secp256k1-sys 0.9.2", "serde", diff --git a/Cargo.toml b/Cargo.toml index c19eb1f5..5ba05449 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -6,7 +6,6 @@ members = [ "moksha-cli", "moksha-wallet", "moksha-mint", - "integrationtests", ] [profile.dev]