Skip to content

Commit

Permalink
even more node
Browse files Browse the repository at this point in the history
  • Loading branch information
drahnr committed Feb 10, 2025
1 parent 98d1a85 commit 04dca08
Show file tree
Hide file tree
Showing 9 changed files with 13 additions and 13 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -98,13 +98,13 @@ jobs:
cat <<EOF > /tmp/Dockerfile
# syntax=docker/dockerfile:1
FROM alpine as builder
COPY /client/app/config /app/fendermint/app/config
COPY /node/app/config /app/fendermint/app/config
COPY /target/release/fendermint /app/output/bin/fendermint
COPY /target/release/ipc-cli /app/output/bin/ipc-cli
EOF
## Append the runner build phase to the Dockerfile.
cat client/docker/runner.Dockerfile >> /tmp/Dockerfile
cat node/docker/runner.Dockerfile >> /tmp/Dockerfile
## Print the Dockerfile for debugging.
echo "Dockerfile:"
Expand Down
2 changes: 1 addition & 1 deletion crates/node/app/settings/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -395,7 +395,7 @@ mod tests {
let default_dir = PathBuf::from("../config");
let c = Settings::config(&default_dir, &current_dir, run_mode)?;
// Trying to debug the following sporadic error on CI:
// thread 'tests::parse_test_config' panicked at client/app/settings/src/lib.rs:315:36:
// thread 'tests::parse_test_config' panicked at node/app/settings/src/lib.rs:315:36:
// failed to parse Settings: failed to parse: invalid digit found in string
// This turned out to be due to the environment variable manipulation below mixing with another test,
// which is why `#[serial]` was moved to the top.
Expand Down
2 changes: 1 addition & 1 deletion crates/node/eth/api/examples/ethers.rs
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ where
};

request("web3_clientVersion", provider.client_version().await, |v| {
v.starts_with("client/")
v.starts_with("node/")
})?;

request("net_version", provider.get_net_version().await, |v| {
Expand Down
4 changes: 2 additions & 2 deletions crates/node/testing/graph-test/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,13 @@
//!
//! 1. All in one go
//! ```text
//! cd client/testing/graph-test
//! cd node/testing/graph-test
//! cargo make
//! ```
//!
//! 2. One by one
//! ```text
//! cd client/testing/graph-test
//! cd node/testing/graph-test
//! cargo make setup
//! cargo make test
//! cargo make teardown
Expand Down
2 changes: 1 addition & 1 deletion crates/node/testing/smoke-test/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
//! Example:
//!
//! ```text
//! cd client/testing/smoke-test
//! cd node/testing/smoke-test
//! cargo make
//! ```
//!
Expand Down
4 changes: 2 additions & 2 deletions crates/node/testing/snapshot-test/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,13 @@
//!
//! 1. All in one go
//! ```text
//! cd client/testing/snapshot-test
//! cd node/testing/snapshot-test
//! cargo make
//! ```
//!
//! 2. One by one
//! ```text
//! cd client/testing/snapshot-test
//! cd node/testing/snapshot-test
//! cargo make setup
//! cargo make node-1-setup
//! cargo make node-2-setup
Expand Down
2 changes: 1 addition & 1 deletion crates/node/testing/src/golden.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ use std::path::Path;
/// Path to a golden file.
fn path(prefix: &str, name: &str, ext: &str) -> String {
// All files will have the same name but different extension.
// They should be under `client/vm/message/golden`.
// They should be under `node/vm/message/golden`.
let path = Path::new("golden").join(prefix).join(name);
format!("{}.{}", path.display(), ext)
}
Expand Down
4 changes: 2 additions & 2 deletions crates/node/vm/interpreter/src/fvm/bundle.rs
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ pub fn bundle_path() -> PathBuf {
.unwrap_or_else(|_| {
workspace_dir()
.join("crates")
.join("client/builtin-actors/output")
.join("node/builtin-actors/output")
.join("bundle.car")
})
}
Expand All @@ -44,7 +44,7 @@ pub fn custom_actors_bundle_path() -> PathBuf {
.unwrap_or_else(|_| {
workspace_dir()
.join("crates")
.join("client/actors/output")
.join("node/actors/output")
.join("custom_actors_bundle.car")
})
}
2 changes: 1 addition & 1 deletion crates/node/vm/interpreter/src/fvm/state/exec.rs
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ pub struct FvmStateParams {

/// Custom implementation of Debug to exclude `consensus_params` from the debug output
/// if it is `None`. This ensures consistency between the debug output and JSON/CBOR
/// serialization, which omits `None` values for `consensus_params`. See: client/vm/interpreter/tests/golden.rs.
/// serialization, which omits `None` values for `consensus_params`. See: node/vm/interpreter/tests/golden.rs.
///
/// This implementation is temporary and should be removed once `consensus_params` is
/// no longer part of `FvmStateParams`.
Expand Down

0 comments on commit 04dca08

Please sign in to comment.