Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: mark flag incompatibility #9530

Merged
merged 3 commits into from
Dec 10, 2024
Merged

fix: mark flag incompatibility #9530

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e169918
enforce stricter command compatibility mode for forge test
zerosnacks Dec 9, 2024
49e43f7
add conflicting cases for anvil
zerosnacks Dec 10, 2024
48d5cf2
revert anvil changes, derivation_path is not exclusive to mnemonics
zerosnacks Dec 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions crates/anvil/src/cmd.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ pub struct NodeArgs {

/// The EVM hardfork to use.
///
/// Choose the hardfork by name, e.g. `shanghai`, `paris`, `london`, etc...
/// Choose the hardfork by name, e.g. `cancun`, `shanghai`, `paris`, `london`, etc...
/// [default: latest]
#[arg(long)]
pub hardfork: Option<String>,
Expand Down Expand Up @@ -177,7 +177,7 @@ pub struct NodeArgs {
/// Max number of states to persist on disk.
///
/// Note that `prune_history` will overwrite `max_persisted_states` to 0.
#[arg(long)]
#[arg(long, conflicts_with = "prune_history")]
pub max_persisted_states: Option<usize>,

/// Number of blocks with transactions to keep in memory.
Expand Down
8 changes: 4 additions & 4 deletions crates/forge/bin/cmd/test/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ pub struct TestArgs {
///
/// If the matching test is a fuzz test, then it will open the debugger on the first failure
/// case. If the fuzz test does not fail, it will open the debugger on the last fuzz case.
#[arg(long, value_name = "DEPRECATED_TEST_FUNCTION_REGEX")]
#[arg(long, conflicts_with_all = ["flamegraph", "flamechart", "decode_internal", "rerun"], value_name = "DEPRECATED_TEST_FUNCTION_REGEX")]
debug: Option<Option<Regex>>,

/// Generate a flamegraph for a single test. Implies `--decode-internal`.
Expand Down Expand Up @@ -123,7 +123,7 @@ pub struct TestArgs {
allow_failure: bool,

/// Output test results as JUnit XML report.
#[arg(long, conflicts_with_all = ["quiet", "json", "gas_report"], help_heading = "Display options")]
#[arg(long, conflicts_with_all = ["quiet", "json", "gas_report", "summary", "list", "show_progress"], help_heading = "Display options")]
pub junit: bool,

/// Stop running tests after the first failure.
Expand All @@ -135,7 +135,7 @@ pub struct TestArgs {
etherscan_api_key: Option<String>,

/// List tests instead of running them.
#[arg(long, short, help_heading = "Display options")]
#[arg(long, short, conflicts_with_all = ["show_progress", "decode_internal", "summary"], help_heading = "Display options")]
list: bool,

/// Set seed used to generate randomness during your fuzz runs.
Expand All @@ -154,7 +154,7 @@ pub struct TestArgs {
pub fuzz_input_file: Option<String>,

/// Show test execution progress.
#[arg(long)]
#[arg(long, conflicts_with_all = ["quiet", "json"], help_heading = "Display options")]
pub show_progress: bool,

#[command(flatten)]
Expand Down
Loading