Compare commits

...

5 Commits

Author SHA1 Message Date
Omar Abdulla 949d7d3802 Fix the working directory canonicalization 2025-11-04 06:12:49 +03:00
Omar Abdulla 6a20dbf058 Update the resolc compiler tests 2025-11-04 05:25:13 +03:00
Omar Abdulla 9987952c63 Fix an issue with file errors in substrate export-chainspec 2025-11-04 05:17:32 +03:00
Omar Abdulla 2087453634 Merge remote-tracking branch 'origin/main' into fix/os-error-in-substrate-export-chainspec 2025-11-04 05:17:06 +03:00
Omar Abdulla 9b75a4f236 Update the commit hash of resolc compiler tests 2025-11-03 00:25:56 +03:00
5 changed files with 24 additions and 5 deletions
+5 -1
View File
@@ -16,6 +16,7 @@ use alloy::{
primitives::{B256, FixedBytes, U256}, primitives::{B256, FixedBytes, U256},
signers::local::PrivateKeySigner, signers::local::PrivateKeySigner,
}; };
use anyhow::Context as _;
use clap::{Parser, ValueEnum, ValueHint}; use clap::{Parser, ValueEnum, ValueHint};
use revive_dt_common::types::{ParsedTestSpecifier, PlatformIdentifier}; use revive_dt_common::types::{ParsedTestSpecifier, PlatformIdentifier};
use semver::Version; use semver::Version;
@@ -1079,7 +1080,10 @@ impl FromStr for WorkingDirectoryConfiguration {
fn from_str(s: &str) -> Result<Self, Self::Err> { fn from_str(s: &str) -> Result<Self, Self::Err> {
match s { match s {
"" => Ok(Default::default()), "" => Ok(Default::default()),
_ => Ok(Self::Path(PathBuf::from(s))), _ => PathBuf::from(s)
.canonicalize()
.context("Failed to canonicalize the working directory path")
.map(Self::Path),
} }
} }
} }
+14 -2
View File
@@ -234,9 +234,15 @@ impl Platform for ReviveDevNodePolkavmResolcPlatform {
.path .path
.as_path(); .as_path();
let wallet = AsRef::<WalletConfiguration>::as_ref(&context).wallet(); let wallet = AsRef::<WalletConfiguration>::as_ref(&context).wallet();
let working_directory = AsRef::<WorkingDirectoryConfiguration>::as_ref(&context).as_path();
let export_chainspec_command = SubstrateNode::REVIVE_DEV_NODE_EXPORT_CHAINSPEC_COMMAND; let export_chainspec_command = SubstrateNode::REVIVE_DEV_NODE_EXPORT_CHAINSPEC_COMMAND;
SubstrateNode::node_genesis(revive_dev_node_path, export_chainspec_command, &wallet) SubstrateNode::node_genesis(
revive_dev_node_path,
export_chainspec_command,
&wallet,
working_directory,
)
} }
} }
@@ -302,9 +308,15 @@ impl Platform for ReviveDevNodeRevmSolcPlatform {
.path .path
.as_path(); .as_path();
let wallet = AsRef::<WalletConfiguration>::as_ref(&context).wallet(); let wallet = AsRef::<WalletConfiguration>::as_ref(&context).wallet();
let working_directory = AsRef::<WorkingDirectoryConfiguration>::as_ref(&context).as_path();
let export_chainspec_command = SubstrateNode::REVIVE_DEV_NODE_EXPORT_CHAINSPEC_COMMAND; let export_chainspec_command = SubstrateNode::REVIVE_DEV_NODE_EXPORT_CHAINSPEC_COMMAND;
SubstrateNode::node_genesis(revive_dev_node_path, export_chainspec_command, &wallet) SubstrateNode::node_genesis(
revive_dev_node_path,
export_chainspec_command,
&wallet,
working_directory,
)
} }
} }
@@ -160,6 +160,7 @@ impl SubstrateNode {
&self.node_binary, &self.node_binary,
&self.export_chainspec_command, &self.export_chainspec_command,
&self.wallet, &self.wallet,
self.base_directory.as_path(),
) )
.context("Failed to prepare the chainspec command")?; .context("Failed to prepare the chainspec command")?;
@@ -319,6 +320,7 @@ impl SubstrateNode {
node_path: &Path, node_path: &Path,
export_chainspec_command: &str, export_chainspec_command: &str,
wallet: &EthereumWallet, wallet: &EthereumWallet,
base_directory: impl AsRef<Path>,
) -> anyhow::Result<serde_json::Value> { ) -> anyhow::Result<serde_json::Value> {
trace!("Exporting the chainspec"); trace!("Exporting the chainspec");
let output = Command::new(node_path) let output = Command::new(node_path)
@@ -326,6 +328,7 @@ impl SubstrateNode {
.arg("--chain") .arg("--chain")
.arg("dev") .arg("dev")
.env_remove("RUST_LOG") .env_remove("RUST_LOG")
.current_dir(base_directory)
.output() .output()
.context("Failed to export the chain-spec")?; .context("Failed to export the chain-spec")?;