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

[move-prover] Refactored options creation for better reuse #250_173 #480

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

[move-prover] Refactored options creation for better reuse #250_173 #480

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 10 additions & 9 deletions language/tools/move-cli/src/base/prove.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,15 @@ impl Prove {
Some(ProverOptions::Options(opts)) => opts,
_ => vec![],
};
run_move_prover(config, &rerooted_path, &target_filter, for_test, &opts)
let mut args = vec!["package".to_string()];
let prover_toml = Path::new(&rerooted_path).join("Prover.toml");
if prover_toml.exists() {
args.push(format!("--config={}", prover_toml.to_string_lossy()));
}
args.extend(opts.iter().cloned());
let options = move_prover::cli::Options::create_from_args(&args)?;

run_move_prover(config, &rerooted_path, &target_filter, for_test, options)
}
}

Expand Down Expand Up @@ -146,18 +154,11 @@ pub fn run_move_prover(
path: &Path,
target_filter: &Option<String>,
for_test: bool,
options: &[String],
mut options: move_prover::cli::Options,
) -> anyhow::Result<()> {
// Always run the prover in dev mode, so addresses get default assignments
config.dev_mode = true;

let mut args = vec!["package".to_string()];
let prover_toml = Path::new(&path).join("Prover.toml");
if prover_toml.exists() {
args.push(format!("--config={}", prover_toml.to_string_lossy()));
}
args.extend(options.iter().cloned());
let mut options = move_prover::cli::Options::create_from_args(&args)?;
if !options.move_sources.is_empty() {
bail!(
"move prover options must not specify sources as those are given \
Expand Down