mirror of
https://github.com/mimblewimble/grin.git
synced 2025-01-21 11:31:08 +03:00
Cancel tx should set output status to Unspent (#2368)
* cancelling transaction should reset output status to Unspent * rustfmt
This commit is contained in:
parent
e3a1c2c6b1
commit
5fcf93deae
2 changed files with 25 additions and 1 deletions
|
@ -465,6 +465,30 @@ mod wallet_tests {
|
||||||
let arg_vec = vec!["grin", "wallet", "-p", "password", "check"];
|
let arg_vec = vec!["grin", "wallet", "-p", "password", "check"];
|
||||||
execute_command(&app, test_dir, "wallet1", &client1, arg_vec)?;
|
execute_command(&app, test_dir, "wallet1", &client1, arg_vec)?;
|
||||||
|
|
||||||
|
// Another file exchange, cancel this time
|
||||||
|
let arg_vec = vec![
|
||||||
|
"grin",
|
||||||
|
"wallet",
|
||||||
|
"-p",
|
||||||
|
"password",
|
||||||
|
"-a",
|
||||||
|
"mining",
|
||||||
|
"send",
|
||||||
|
"-m",
|
||||||
|
"file",
|
||||||
|
"-d",
|
||||||
|
&file_name,
|
||||||
|
"-g",
|
||||||
|
"Ain't sending 2",
|
||||||
|
"10",
|
||||||
|
];
|
||||||
|
execute_command(&app, test_dir, "wallet1", &client1, arg_vec)?;
|
||||||
|
|
||||||
|
let arg_vec = vec![
|
||||||
|
"grin", "wallet", "-p", "password", "-a", "mining", "cancel", "-i", "26",
|
||||||
|
];
|
||||||
|
execute_command(&app, test_dir, "wallet1", &client1, arg_vec)?;
|
||||||
|
|
||||||
// txs and outputs (mostly spit out for a visual in test logs)
|
// txs and outputs (mostly spit out for a visual in test logs)
|
||||||
let arg_vec = vec!["grin", "wallet", "-p", "password", "-a", "mining", "txs"];
|
let arg_vec = vec!["grin", "wallet", "-p", "password", "-a", "mining", "txs"];
|
||||||
execute_command(&app, test_dir, "wallet1", &client1, arg_vec)?;
|
execute_command(&app, test_dir, "wallet1", &client1, arg_vec)?;
|
||||||
|
|
|
@ -202,7 +202,7 @@ where
|
||||||
batch.delete(&o.key_id, &o.mmr_index)?;
|
batch.delete(&o.key_id, &o.mmr_index)?;
|
||||||
}
|
}
|
||||||
if o.status == OutputStatus::Locked {
|
if o.status == OutputStatus::Locked {
|
||||||
o.status = OutputStatus::Unconfirmed;
|
o.status = OutputStatus::Unspent;
|
||||||
batch.save(o)?;
|
batch.save(o)?;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue