lukechilds
/
itchysats
mirror of https://github.com/lukechilds/itchysats.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Simplify Cfd state assertions in tests 

Add a macro to simplify assertions on Cfd state in both maker and taker, which
significantly reduces boilerplate in tests.
Macro was used for brevity (we can hide `.await.unwrap()`), when a function was
used it would take 4 lines after formatting.
test-force-close-without-fake-clock
Mariusz Klochowicz 3 years ago
parent
eda4aea3d7
commit
99c5273317
No known key found for this signature in database GPG Key ID: 470C865699C8D4D
2 changed files with 31 additions and 56 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      daemon/src/projection.rs
  2. 85
      daemon/tests/happy_path.rs

2
daemon/src/projection.rs
View File

@ -354,7 +354,7 @@ impl From<model::Identity> for Identity {
}
}
#[derive(Debug, Clone, Serialize)]
#[derive(Debug, Clone, PartialEq, Serialize)]
pub enum CfdState {
OutgoingOrderRequest,
IncomingOrderRequest,

85
daemon/tests/happy_path.rs
View File

@ -1,5 +1,3 @@
use std::time::Duration;
use crate::harness::dummy_new_order;
use crate::harness::flow::is_next_none;
use crate::harness::flow::next;
@ -20,9 +18,25 @@ use daemon::projection::CfdState;
use daemon::projection::Identity;
use maia::secp256k1_zkp::schnorrsig;
use rust_decimal_macros::dec;
use std::time::Duration;
use tokio::time::sleep;
mod harness;
/// Assert the next state of the single cfd present at both maker and taker
macro_rules! assert_next_state {
($state:expr, $maker:expr, $taker:expr, $id:expr) => {
// TODO: Allow fetching cfd with the specified id if there is more than
// one on the cfd feed
let (taker_cfd, maker_cfd) = next_cfd($taker.cfd_feed(), $maker.cfd_feed())
.await
.unwrap();
assert_eq!(taker_cfd.order_id, $id);
assert_eq!(maker_cfd.order_id, $id);
assert_eq!(taker_cfd.state, $state);
assert_eq!(maker_cfd.state, $state);
};
}
#[tokio::test]
async fn taker_receives_order_from_maker_on_publication() {
let _guard = init_tracing();
@ -58,23 +72,12 @@ async fn taker_takes_order_and_maker_rejects() {
let (taker_cfd, maker_cfd) = next_cfd(taker.cfd_feed(), maker.cfd_feed()).await.unwrap();
assert_eq!(taker_cfd.order_id, received.id);
assert_eq!(maker_cfd.order_id, received.id);
assert!(matches!(
taker_cfd.state,
CfdState::OutgoingOrderRequest { .. }
));
assert!(matches!(
maker_cfd.state,
CfdState::IncomingOrderRequest { .. }
));
assert_eq!(taker_cfd.state, CfdState::OutgoingOrderRequest);
assert_eq!(maker_cfd.state, CfdState::IncomingOrderRequest);
maker.reject_take_request(received.clone()).await;
let (taker_cfd, maker_cfd) = next_cfd(taker.cfd_feed(), maker.cfd_feed()).await.unwrap();
// TODO: More elaborate Cfd assertions
assert_eq!(taker_cfd.order_id, received.id);
assert_eq!(maker_cfd.order_id, received.id);
assert!(matches!(taker_cfd.state, CfdState::Rejected { .. }));
assert!(matches!(maker_cfd.state, CfdState::Rejected { .. }));
assert_next_state!(CfdState::Rejected, maker, taker, received.id);
}
#[tokio::test]
@ -111,28 +114,16 @@ async fn taker_takes_order_and_maker_accepts_and_contract_setup() {
maker.accept_take_request(received.clone()).await;
let (taker_cfd, maker_cfd) = next_cfd(taker.cfd_feed(), maker.cfd_feed()).await.unwrap();
// TODO: More elaborate Cfd assertions
assert_eq!(taker_cfd.order_id, received.id);
assert_eq!(maker_cfd.order_id, received.id);
assert!(matches!(taker_cfd.state, CfdState::ContractSetup { .. }));
assert!(matches!(maker_cfd.state, CfdState::ContractSetup { .. }));
assert_next_state!(CfdState::ContractSetup, maker, taker, received.id);
maker.mocks.mock_wallet_sign_and_broadcast().await;
taker.mocks.mock_wallet_sign_and_broadcast().await;
let (taker_cfd, maker_cfd) = next_cfd(taker.cfd_feed(), maker.cfd_feed()).await.unwrap();
// TODO: More elaborate Cfd assertions
assert_eq!(taker_cfd.order_id, received.id);
assert_eq!(maker_cfd.order_id, received.id);
assert!(matches!(taker_cfd.state, CfdState::PendingOpen { .. }));
assert!(matches!(maker_cfd.state, CfdState::PendingOpen { .. }));
assert_next_state!(CfdState::PendingOpen, maker, taker, received.id);
deliver_event!(maker, taker, Event::LockFinality(received.id));
let (taker_cfd, maker_cfd) = next_cfd(taker.cfd_feed(), maker.cfd_feed()).await.unwrap();
assert!(matches!(taker_cfd.state, CfdState::Open { .. }));
assert!(matches!(maker_cfd.state, CfdState::Open { .. }));
assert_next_state!(CfdState::Open, maker, taker, received.id);
}
#[tokio::test]
@ -143,14 +134,8 @@ async fn collaboratively_close_an_open_cfd() {
taker.propose_settlement(order_id).await;
let (taker_cfd, maker_cfd) = next_cfd(taker.cfd_feed(), maker.cfd_feed()).await.unwrap();
assert!(matches!(
taker_cfd.state,
CfdState::OutgoingSettlementProposal { .. }
));
assert!(matches!(
maker_cfd.state,
CfdState::IncomingSettlementProposal { .. }
));
assert_eq!(taker_cfd.state, CfdState::OutgoingSettlementProposal);
assert_eq!(maker_cfd.state, CfdState::IncomingSettlementProposal);
maker.mocks.mock_monitor_collaborative_settlement().await;
taker.mocks.mock_monitor_collaborative_settlement().await;
@ -158,17 +143,13 @@ async fn collaboratively_close_an_open_cfd() {
maker.accept_settlement_proposal(order_id).await;
sleep(Duration::from_secs(5)).await; // need to wait a bit until both transition
let (taker_cfd, maker_cfd) = next_cfd(taker.cfd_feed(), maker.cfd_feed()).await.unwrap();
assert!(matches!(taker_cfd.state, CfdState::PendingClose { .. }));
assert!(matches!(maker_cfd.state, CfdState::PendingClose { .. }));
assert_next_state!(CfdState::PendingClose, maker, taker, order_id);
deliver_event!(maker, taker, Event::CloseFinality(order_id));
sleep(Duration::from_secs(5)).await; // need to wait a bit until both transition
let (taker_cfd, maker_cfd) = next_cfd(taker.cfd_feed(), maker.cfd_feed()).await.unwrap();
assert!(matches!(taker_cfd.state, CfdState::Closed { .. }));
assert!(matches!(maker_cfd.state, CfdState::Closed { .. }));
assert_next_state!(CfdState::Closed, maker, taker, order_id);
}
#[tokio::test]
@ -279,21 +260,15 @@ async fn start_from_open_cfd_state() -> (Maker, Taker, OrderId) {
maker.accept_take_request(received.clone()).await;
let (taker_cfd, maker_cfd) = next_cfd(taker.cfd_feed(), maker.cfd_feed()).await.unwrap();
assert!(matches!(taker_cfd.state, CfdState::ContractSetup { .. }));
assert!(matches!(maker_cfd.state, CfdState::ContractSetup { .. }));
assert_next_state!(CfdState::ContractSetup, maker, taker, received.id);
maker.mocks.mock_wallet_sign_and_broadcast().await;
taker.mocks.mock_wallet_sign_and_broadcast().await;
let (taker_cfd, maker_cfd) = next_cfd(taker.cfd_feed(), maker.cfd_feed()).await.unwrap();
assert!(matches!(taker_cfd.state, CfdState::PendingOpen { .. }));
assert!(matches!(maker_cfd.state, CfdState::PendingOpen { .. }));
assert_next_state!(CfdState::PendingOpen, maker, taker, received.id);
deliver_event!(maker, taker, Event::LockFinality(received.id));
let (taker_cfd, maker_cfd) = next_cfd(taker.cfd_feed(), maker.cfd_feed()).await.unwrap();
assert!(matches!(taker_cfd.state, CfdState::Open { .. }));
assert!(matches!(maker_cfd.state, CfdState::Open { .. }));
assert_next_state!(CfdState::Open, maker, taker, received.id);
(maker, taker, received.id)
}

Write Preview
Loading…
Cancel
Save