Skip to content

fix: actually use already passed contract message arguments #713

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

Closed
moliholy wants to merge 1 commit into from
Closed

fix: actually use already passed contract message arguments #713

Show file tree
Hide file tree
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
4 changes: 2 additions & 2 deletions crates/pop-cli/src/commands/call/contract.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ use crate::{
builds::{ensure_project_path, get_project_path},
contracts::{
has_contract_been_built, map_account, normalize_call_args,
request_contract_function_args,
request_remaining_contract_function_args,
},
prompt::display_message,
rpc::prompt_to_select_chain_rpc,
Expand Down Expand Up @@ -247,7 +247,7 @@ impl CallContractCommand {

fn configure_message(&mut self, message: &ContractFunction, cli: &mut impl Cli) -> Result<()> {
// Resolve message arguments.
self.args = request_contract_function_args(message, cli)?;
self.args = request_remaining_contract_function_args(message, cli, &self.args)?;

// Resolve value.
if message.payable && self.value == DEFAULT_PAYABLE_VALUE {
Expand Down
4 changes: 2 additions & 2 deletions crates/pop-cli/src/commands/up/contract.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ use crate::{
common::{
contracts::{
check_ink_node_and_prompt, has_contract_been_built, map_account, normalize_call_args,
request_contract_function_args, terminate_nodes,
request_remaining_contract_function_args, terminate_nodes,
},
rpc::prompt_to_select_chain_rpc,
urls,
Expand Down Expand Up @@ -344,7 +344,7 @@ impl UpContractCommand {
let function =
extract_function(self.path.clone(), &self.constructor, FunctionType::Constructor)?;
if self.args.is_empty() && !function.args.is_empty() {
self.args = request_contract_function_args(&function, &mut Cli)?;
self.args = request_remaining_contract_function_args(&function, &mut Cli, &self.args)?;
}
normalize_call_args(&mut self.args, &function);
// Otherwise instantiate.
Expand Down
10 changes: 6 additions & 4 deletions crates/pop-cli/src/common/contracts.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,15 +108,17 @@ pub fn has_contract_been_built(path: &Path) -> bool {
/// # Arguments
/// * `function` - The contract function containing argument definitions.
/// * `cli` - Command line interface implementation for user interaction.
/// * `current_args` - A vector of strings containing the user-provided argument values.
///
/// # Returns
/// A vector of strings containing the user-provided argument values.
pub fn request_contract_function_args(
pub fn request_remaining_contract_function_args(
function: &ContractFunction,
cli: &mut impl Cli,
current_args: &[String],
) -> anyhow::Result<Vec<String>> {
let mut user_provided_args = Vec::new();
for arg in &function.args {
let mut user_provided_args = current_args.to_vec();
for arg in function.args.iter().skip(user_provided_args.len()) {
let mut input = cli
.input(format!("Enter the value for the parameter: {}", arg.label))
.placeholder(&format!("Type required: {}", arg.type_name));
Expand Down Expand Up @@ -225,7 +227,7 @@ mod tests {
"new",
FunctionType::Constructor,
)?;
assert_eq!(request_contract_function_args(&function, &mut cli)?, vec!["true"]);
assert_eq!(request_remaining_contract_function_args(&function, &mut cli, &[])?, vec!["true"]);
cli.verify()
}

Expand Down
Loading