diff --git a/Cargo.lock b/Cargo.lock index aeb3b337f..084149377 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3028,6 +3028,49 @@ dependencies = [ "serde_json", ] +[[package]] +name = "fendermint_graph_test" +version = "0.1.0" + +[[package]] +name = "fendermint_materializer" +version = "0.1.0" +dependencies = [ + "anyhow", + "arbitrary", + "async-recursion", + "async-trait", + "bollard", + "env_logger 0.10.2", + "ethers", + "fendermint_crypto", + "fendermint_materializer", + "fendermint_testing", + "fendermint_vm_actor_interface", + "fendermint_vm_core", + "fendermint_vm_encoding", + "fendermint_vm_genesis", + "futures", + "fvm_shared", + "hex", + "ipc-api", + "lazy_static", + "multihash 0.18.1", + "quickcheck", + "quickcheck_async", + "quickcheck_macros", + "serde", + "serde_json", + "serde_with 2.3.3", + "serde_yaml", + "serial_test", + "tempfile", + "tendermint-rpc", + "tokio", + "toml 0.8.10", + "tracing", +] + [[package]] name = "fendermint_rocksdb" version = "0.1.0" @@ -3118,45 +3161,6 @@ dependencies = [ "toml 0.8.10", ] -[[package]] -name = "fendermint_testing_materializer" -version = "0.1.0" -dependencies = [ - "anyhow", - "arbitrary", - "async-recursion", - "async-trait", - "bollard", - "env_logger 0.10.2", - "ethers", - "fendermint_crypto", - "fendermint_testing", - "fendermint_testing_materializer", - "fendermint_vm_actor_interface", - "fendermint_vm_core", - "fendermint_vm_encoding", - "fendermint_vm_genesis", - "futures", - "fvm_shared", - "hex", - "ipc-api", - "lazy_static", - "multihash 0.18.1", - "quickcheck", - "quickcheck_async", - "quickcheck_macros", - "serde", - "serde_json", - "serde_with 2.3.3", - "serde_yaml", - "serial_test", - "tempfile", - "tendermint-rpc", - "tokio", - "toml 0.8.10", - "tracing", -] - [[package]] name = "fendermint_vm_actor_interface" version = "0.1.0" @@ -4253,10 +4257,6 @@ dependencies = [ "wasm-bindgen", ] -[[package]] -name = "graph-test" -version = "0.1.0" - [[package]] name = "group" version = "0.12.1" diff --git a/fendermint/Makefile b/fendermint/Makefile index aec2d1d69..b9160e198 100644 --- a/fendermint/Makefile +++ b/fendermint/Makefile @@ -43,14 +43,14 @@ test: $(BUILTIN_ACTORS_BUNDLE) $(IPC_ACTORS_GEN) FM_BUILTIN_ACTORS_BUNDLE=$(BUILTIN_ACTORS_BUNDLE) \ FM_CUSTOM_ACTORS_BUNDLE=$(CUSTOM_ACTORS_BUNDLE) \ FM_CONTRACTS_DIR=$(IPC_ACTORS_OUT) \ - cargo test --release $(shell echo $(PACKAGE) | sed 's/--package fendermint_testing_materializer//g') + cargo test --release $(shell echo $(PACKAGE) | sed 's/--package fendermint_materializer//g') # Not using --release beause the build has been done in docker and the wasm code runs inside the container. e2e: docker-build | cargo-make cd testing/smoke-test && cargo make --profile $(PROFILE) cd testing/snapshot-test && cargo make --profile $(PROFILE) cd testing/graph-test && cargo make --profile $(PROFILE) - PROFILE=$(PROFILE) cargo test --package fendermint_testing_materializer + PROFILE=$(PROFILE) cargo test --package fendermint_materializer clean: cargo clean diff --git a/fendermint/testing/graph-test/Cargo.toml b/fendermint/testing/graph-test/Cargo.toml index c17d99e2d..1d9a436c4 100644 --- a/fendermint/testing/graph-test/Cargo.toml +++ b/fendermint/testing/graph-test/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "graph-test" +name = "fendermint_graph_test" version = "0.1.0" edition = "2021" diff --git a/fendermint/testing/materializer/Cargo.toml b/fendermint/testing/materializer/Cargo.toml index b038ccd2a..4b4894fd3 100644 --- a/fendermint/testing/materializer/Cargo.toml +++ b/fendermint/testing/materializer/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "fendermint_testing_materializer" +name = "fendermint_materializer" description = "Toolkit to instantiate testnets" version = "0.1.0" authors.workspace = true @@ -54,7 +54,7 @@ tokio = { workspace = true } toml = { workspace = true } # Enable arb on self for tests. -fendermint_testing_materializer = { path = ".", features = ["arb"] } +fendermint_materializer = { path = ".", features = ["arb"] } fendermint_testing = { path = "..", features = ["golden"] } [features] diff --git a/fendermint/testing/materializer/tests/docker.rs b/fendermint/testing/materializer/tests/docker.rs index af12757de..14191ea4a 100644 --- a/fendermint/testing/materializer/tests/docker.rs +++ b/fendermint/testing/materializer/tests/docker.rs @@ -4,12 +4,12 @@ //! //! # Example //! -//! `cargo test -p fendermint_testing_materializer --test docker -- --nocapture` +//! `cargo test -p fendermint_materializer --test docker -- --nocapture` use std::{env::current_dir, path::PathBuf, pin::Pin, time::Duration}; use anyhow::Context; -use fendermint_testing_materializer::{ +use fendermint_materializer::{ docker::{DockerMaterializer, DockerMaterials}, manifest::Manifest, testnet::Testnet, diff --git a/fendermint/testing/materializer/tests/docker_tests/root_only.rs b/fendermint/testing/materializer/tests/docker_tests/root_only.rs index d501f4258..d74892a75 100644 --- a/fendermint/testing/materializer/tests/docker_tests/root_only.rs +++ b/fendermint/testing/materializer/tests/docker_tests/root_only.rs @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0, MIT use anyhow::{anyhow, bail}; use ethers::{providers::Middleware, types::U64}; -use fendermint_testing_materializer::HasEthApi; +use fendermint_materializer::HasEthApi; use futures::FutureExt; use crate::with_testnet; diff --git a/fendermint/testing/materializer/tests/golden.rs b/fendermint/testing/materializer/tests/golden.rs index 908067ac0..28aee25cc 100644 --- a/fendermint/testing/materializer/tests/golden.rs +++ b/fendermint/testing/materializer/tests/golden.rs @@ -2,22 +2,22 @@ // SPDX-License-Identifier: Apache-2.0, MIT mod json { + use fendermint_materializer::manifest::Manifest; use fendermint_testing::golden_json; - use fendermint_testing_materializer::manifest::Manifest; use quickcheck::Arbitrary; golden_json! { "manifest/json", manifest, Manifest::arbitrary } } mod yaml { + use fendermint_materializer::manifest::Manifest; use fendermint_testing::golden_yaml; - use fendermint_testing_materializer::manifest::Manifest; use quickcheck::Arbitrary; golden_yaml! { "manifest/yaml", manifest, Manifest::arbitrary } } mod toml { + use fendermint_materializer::manifest::Manifest; use fendermint_testing::golden_toml; - use fendermint_testing_materializer::manifest::Manifest; use quickcheck::Arbitrary; golden_toml! { "manifest/toml", manifest, Manifest::arbitrary } }