mirror of
https://github.com/pezkuwichain/revive-differential-tests.git
synced 2026-04-24 23:58:01 +00:00
Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 64c0924fb9 | |||
| 408754e8fb |
+2
-14
@@ -234,15 +234,9 @@ impl Platform for ReviveDevNodePolkavmResolcPlatform {
|
||||
.path
|
||||
.as_path();
|
||||
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;
|
||||
|
||||
SubstrateNode::node_genesis(
|
||||
revive_dev_node_path,
|
||||
export_chainspec_command,
|
||||
&wallet,
|
||||
working_directory,
|
||||
)
|
||||
SubstrateNode::node_genesis(revive_dev_node_path, export_chainspec_command, &wallet)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -308,15 +302,9 @@ impl Platform for ReviveDevNodeRevmSolcPlatform {
|
||||
.path
|
||||
.as_path();
|
||||
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;
|
||||
|
||||
SubstrateNode::node_genesis(
|
||||
revive_dev_node_path,
|
||||
export_chainspec_command,
|
||||
&wallet,
|
||||
working_directory,
|
||||
)
|
||||
SubstrateNode::node_genesis(revive_dev_node_path, export_chainspec_command, &wallet)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -160,7 +160,6 @@ impl SubstrateNode {
|
||||
&self.node_binary,
|
||||
&self.export_chainspec_command,
|
||||
&self.wallet,
|
||||
self.base_directory.as_path(),
|
||||
)
|
||||
.context("Failed to prepare the chainspec command")?;
|
||||
|
||||
@@ -320,7 +319,6 @@ impl SubstrateNode {
|
||||
node_path: &Path,
|
||||
export_chainspec_command: &str,
|
||||
wallet: &EthereumWallet,
|
||||
base_directory: impl AsRef<Path>,
|
||||
) -> anyhow::Result<serde_json::Value> {
|
||||
trace!("Exporting the chainspec");
|
||||
let output = Command::new(node_path)
|
||||
@@ -328,7 +326,6 @@ impl SubstrateNode {
|
||||
.arg("--chain")
|
||||
.arg("dev")
|
||||
.env_remove("RUST_LOG")
|
||||
.current_dir(base_directory)
|
||||
.output()
|
||||
.context("Failed to export the chain-spec")?;
|
||||
|
||||
|
||||
@@ -2,12 +2,13 @@
|
||||
|
||||
use std::{
|
||||
collections::HashMap,
|
||||
str::FromStr,
|
||||
sync::{LazyLock, Mutex},
|
||||
};
|
||||
|
||||
use revive_dt_common::types::VersionOrRequirement;
|
||||
|
||||
use semver::Version;
|
||||
use semver::{Version, VersionReq};
|
||||
use sha2::{Digest, Sha256};
|
||||
|
||||
use crate::list::List;
|
||||
@@ -65,6 +66,9 @@ impl SolcDownloader {
|
||||
target: &'static str,
|
||||
list: &'static str,
|
||||
) -> anyhow::Result<Self> {
|
||||
static MAXIMUM_COMPILER_VERSION_REQUIREMENT: LazyLock<VersionReq> =
|
||||
LazyLock::new(|| VersionReq::from_str("<=0.8.30").unwrap());
|
||||
|
||||
let version_or_requirement = version.into();
|
||||
match version_or_requirement {
|
||||
VersionOrRequirement::Version(version) => Ok(Self {
|
||||
@@ -79,7 +83,10 @@ impl SolcDownloader {
|
||||
.builds
|
||||
.into_iter()
|
||||
.map(|build| build.version)
|
||||
.filter(|version| requirement.matches(version))
|
||||
.filter(|version| {
|
||||
MAXIMUM_COMPILER_VERSION_REQUIREMENT.matches(version)
|
||||
&& requirement.matches(version)
|
||||
})
|
||||
.max()
|
||||
else {
|
||||
anyhow::bail!("Failed to find a version that satisfies {requirement:?}");
|
||||
|
||||
Reference in New Issue
Block a user