merging master changes

This commit is contained in:
Lorenzo Tucci 2023-01-11 13:36:03 +01:00
commit 925c7bc179
No known key found for this signature in database
GPG key ID: D98C4FA2CDF590A0
37 changed files with 279 additions and 219 deletions

View file

@ -301,7 +301,7 @@ pub mod api_test {
swap_id: Some(Uuid::from_str(SWAP_ID).unwrap()),
..Default::default()
},
cmd: Method::Cancel,
cmd: Method::CancelAndRefund,
shutdown: Shutdown::new(tx.subscribe()),
}
}
@ -312,7 +312,7 @@ pub mod api_test {
swap_id: Some(Uuid::from_str(SWAP_ID).unwrap()),
..Default::default()
},
cmd: Method::Refund,
cmd: Method::CancelAndRefund,
shutdown: Shutdown::new(tx.subscribe()),
}
}