TEST: make test; path fixes

Author: aakoshh

Cargo.lock

@@ -0,0 +1,8 @@
+# Each major sub-repository in this monorepo has their own Makefiles;
+# instead of making an even more compilicated common one, let's delegate to them.
+
+test:
+	make -C fvm-utils test
+	make -C ipc test
+	make -C ipld-resolver test
+	make -C fendermint test

Makefile

@@ -2,13 +2,9 @@
 
 BUILTIN_ACTORS_TAG    ?= v11.0.0
 BUILTIN_ACTORS_BUNDLE := $(PWD)/builtin-actors/output/bundle.car
-BUILTIN_ACTORS_DIR    := ../builtin-actors
+BUILTIN_ACTORS_DIR    := ../../builtin-actors
 
-# Make sure this tag matches the one in Cargo.toml
-IPC_ACTORS_TAG				?= origin/dev
-IPC_ACTORS_DIR        := $(PWD)/../ipc-solidity-actors
-IPC_ACTORS_CODE       := $(shell find $(IPC_ACTORS_DIR) -type f -name "*.sol")
-IPC_ACTORS_ABI        := .make/.ipc-actors-abi
+IPC_ACTORS_DIR        := $(PWD)/../contracts
 IPC_ACTORS_OUT        := $(IPC_ACTORS_DIR)/out
 
 FENDERMINT_CODE       := $(shell find . -type f \( -name "*.rs" -o -name "Cargo.toml" \) | grep -v target)
@@ -37,10 +33,10 @@ install:
 	cargo install --locked --path fendermint/app
 
 # Using --release for testing because wasm can otherwise be slow.
-test: $(IPC_ACTORS_ABI) $(BUILTIN_ACTORS_BUNDLE) $(BUILTIN_ACTORS_DIR)
+test: $(BUILTIN_ACTORS_BUNDLE) $(BUILTIN_ACTORS_DIR)
 	FM_BUILTIN_ACTORS_BUNDLE=$(BUILTIN_ACTORS_BUNDLE) \
 	FM_CONTRACTS_DIR=$(IPC_ACTORS_OUT) \
-	cargo test --release --workspace --exclude smoke-test
+	cargo test --release --package 'fendermint_*'
 
 e2e: docker-build $(BUILTIN_ACTORS_DIR)
 	cd fendermint/testing/smoke-test && cargo make --profile $(PROFILE)
@@ -65,7 +61,7 @@ check-fmt:
 check-clippy:
 	cargo clippy --all --tests -- -D clippy::all
 
-docker-deps: $(BUILTIN_ACTORS_BUNDLE) $(FENDERMINT_CODE) $(IPC_ACTORS_ABI)
+docker-deps: $(BUILTIN_ACTORS_BUNDLE) $(FENDERMINT_CODE)
 	rm -rf docker/.artifacts
 	mkdir -p docker/.artifacts/contracts
 	cp -r $(IPC_ACTORS_OUT)/* docker/.artifacts/contracts
@@ -109,24 +105,6 @@ $(BUILTIN_ACTORS_DIR):
 	git clone https://github.com/filecoin-project/builtin-actors.git . && \
 	git checkout $(BUILTIN_ACTORS_TAG)
 
-
-# Compile the ABI artifacts of the IPC Solidity actors.
-ipc-actors-abi: $(IPC_ACTORS_ABI)
-
-# Check out the IPC Solidity actors if necessary so we get the ABI artifacts, putting down a marker at the end.
-$(IPC_ACTORS_ABI): $(IPC_ACTORS_CODE)
-	if [ ! -d $(IPC_ACTORS_DIR) ]; then \
-		mkdir -p $(IPC_ACTORS_DIR) && \
-		cd $(IPC_ACTORS_DIR) && \
-		git clone https://github.com/consensus-shipyard/ipc-solidity-actors.git .; \
-	fi
-	cd $(IPC_ACTORS_DIR) && \
-	git fetch origin && \
-	git checkout $(IPC_ACTORS_TAG)
-	@# The ABI are already checked in; otherwise we'd have to compile with foundry
-	@# make -C $(IPC_ACTORS_DIR) compile-abi
-	mkdir -p $(dir $@) && touch $@
-
 .PHONY: protoc
 protoc:
 	@if [ -z "$(shell which protoc)" ]; then \

fendermint/Makefile

@@ -61,10 +61,10 @@ type TestContractCall<C, T> = ContractCall<TestMiddleware<C>, T>;
 // This assumes that https://github.com/filecoin-project/builtin-actors is checked out next to this project,
 // which the Makefile in the root takes care of with `make actor-bundle`, a dependency of creating docker images.
 const SIMPLECOIN_HEX: &'static str =
-    include_str!("../../../../../builtin-actors/actors/evm/tests/contracts/SimpleCoin.bin");
+    include_str!("../../../../../../builtin-actors/actors/evm/tests/contracts/SimpleCoin.bin");
 
 // const SIMPLECOIN_ABI: &'static str =
-//     include_str!("../../../../../builtin-actors/actors/evm/tests/contracts/SimpleCoin.abi");
+//     include_str!("../../../../../../builtin-actors/actors/evm/tests/contracts/SimpleCoin.abi");
 
 /// Gas limit to set for transactions.
 const ENOUGH_GAS: u64 = 10_000_000_000u64;
@@ -76,7 +76,7 @@ const FILTERS_ENABLED: bool = true;
 // An example of what it looks like is at https://github.com/filecoin-project/ref-fvm/blob/evm-integration-tests/testing/integration/tests/evm/src/simple_coin/simple_coin.rs
 abigen!(
     SimpleCoin,
-    "../../../../builtin-actors/actors/evm/tests/contracts/SimpleCoin.abi"
+    "../../../../../builtin-actors/actors/evm/tests/contracts/SimpleCoin.abi"
 );
 
 #[derive(Parser, Debug)]

fendermint/fendermint/eth/api/examples/ethers.rs

@@ -40,7 +40,7 @@ type MockProvider = ethers::providers::Provider<ethers::providers::MockProvider>
 type MockContractCall<T> = ethers::prelude::ContractCall<MockProvider, T>;
 
 const CONTRACT_HEX: &'static str =
-    include_str!("../../../../builtin-actors/actors/evm/tests/contracts/SimpleCoin.bin");
+    include_str!("../../../../../builtin-actors/actors/evm/tests/contracts/SimpleCoin.bin");
 
 lazy_static! {
     /// Default gas params based on the testkit.
@@ -56,7 +56,7 @@ lazy_static! {
 // which the `make actor-bundle` command takes care of if it wasn't.
 abigen!(
     SimpleCoin,
-    "../../../builtin-actors/actors/evm/tests/contracts/SimpleCoin.abi"
+    "../../../../builtin-actors/actors/evm/tests/contracts/SimpleCoin.abi"
 );
 
 // Alternatively we can generate the ABI code as follows:

fendermint/fendermint/rpc/examples/simplecoin.rs

@@ -1,5 +1,5 @@
 [package]
-name = "contract-test"
+name = "fendermint_contract_test"
 description = "Model based testing for smart contracts"
 version = "0.1.0"
 authors.workspace = true

fendermint/fendermint/testing/contract-test/Cargo.toml

@@ -3,7 +3,7 @@
 use std::{cell::RefCell, collections::HashSet, sync::Arc};
 
 use arbitrary::{Arbitrary, Unstructured};
-use contract_test::ipc::{registry::RegistryCaller, subnet::SubnetCaller};
+use fendermint_contract_test::ipc::{registry::RegistryCaller, subnet::SubnetCaller};
 use ethers::types as et;
 use fendermint_crypto::{PublicKey, SecretKey};
 use fendermint_testing::smt::StateMachine;
@@ -29,7 +29,7 @@ use super::{
     choose_amount,
     state::{StakingAccount, StakingState},
 };
-use contract_test::ipc::registry::SubnetConstructorParams;
+use fendermint_contract_test::ipc::registry::SubnetConstructorParams;
 
 /// System Under Test for staking.
 pub struct StakingSystem {
@@ -85,7 +85,7 @@ impl StateMachine for StakingMachine {
         let rt = tokio::runtime::Runtime::new().expect("create tokio runtime for init");
 
         let (mut exec_state, _) = rt
-            .block_on(contract_test::init_exec_state(
+            .block_on(fendermint_contract_test::init_exec_state(
                 self.multi_engine.clone(),
                 state.parent_genesis.clone(),
             ))

fendermint/fendermint/testing/contract-test/tests/staking/machine.rs

@@ -1,5 +1,5 @@
 [package]
-name = "smoke-test"
+name = "fendermint_smoke_test"
 description = "Provides some end-to-end integration testing between Fendermint and a full Tendermint node."
 version = "0.1.0"
 authors.workspace = true

fendermint/fendermint/testing/smoke-test/Cargo.toml

@@ -0,0 +1,2 @@
+test:
+	cargo test --release --package primitives --package "fil_*"