Skip to content

Commit

Permalink
Refactor Bridge pool tests to allow modifying pending transfer
Browse files Browse the repository at this point in the history
  • Loading branch information
@sug0
sug0 committed Aug 2, 2023
1 parent d4b5002 commit 312a5cf
Showing 1 changed file with 25 additions and 25 deletions.
50 changes: 25 additions & 25 deletions shared/src/ledger/native_vp/ethereum_bridge/bridge_pool_vp.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -763,14 +763,14 @@ mod test_bridge_pool_vp {
insert_transfer: F,
expect: Expect,
) where
F: FnOnce(PendingTransfer, &mut WriteLog) -> BTreeSet<Key>,
F: FnOnce(&mut PendingTransfer, &mut WriteLog) -> BTreeSet<Key>,
{
// setup
let mut wl_storage = setup_storage();
let tx = Tx::new(TxType::Raw);

// the transfer to be added to the pool
let transfer = PendingTransfer {
let mut transfer = PendingTransfer {
transfer: TransferToEthereum {
kind: TransferToEthereumKind::Erc20,
asset: ASSET,
Expand All @@ -785,7 +785,7 @@ mod test_bridge_pool_vp {
};
// add transfer to pool
let mut keys_changed =
insert_transfer(transfer.clone(), &mut wl_storage.write_log);
insert_transfer(&mut transfer, &mut wl_storage.write_log);

// change Bertha's balances
let mut new_keys_changed = update_balances(
Expand Down Expand Up @@ -847,11 +847,11 @@ mod test_bridge_pool_vp {
SignedAmount::Positive(TOKENS.into()),
|transfer, log| {
log.write(
&get_pending_key(&transfer),
&get_pending_key(transfer),
transfer.try_to_vec().unwrap(),
)
.unwrap();
BTreeSet::from([get_pending_key(&transfer)])
BTreeSet::from([get_pending_key(transfer)])
},
Expect::True,
);
Expand All @@ -868,11 +868,11 @@ mod test_bridge_pool_vp {
SignedAmount::Positive(TOKENS.into()),
|transfer, log| {
log.write(
&get_pending_key(&transfer),
&get_pending_key(transfer),
transfer.try_to_vec().unwrap(),
)
.unwrap();
BTreeSet::from([get_pending_key(&transfer)])
BTreeSet::from([get_pending_key(transfer)])
},
Expect::False,
);
Expand All @@ -889,11 +889,11 @@ mod test_bridge_pool_vp {
SignedAmount::Positive(TOKENS.into()),
|transfer, log| {
log.write(
&get_pending_key(&transfer),
&get_pending_key(transfer),
transfer.try_to_vec().unwrap(),
)
.unwrap();
BTreeSet::from([get_pending_key(&transfer)])
BTreeSet::from([get_pending_key(transfer)])
},
Expect::False,
);
Expand All @@ -910,11 +910,11 @@ mod test_bridge_pool_vp {
SignedAmount::Positive(TOKENS.into()),
|transfer, log| {
log.write(
&get_pending_key(&transfer),
&get_pending_key(transfer),
transfer.try_to_vec().unwrap(),
)
.unwrap();
BTreeSet::from([get_pending_key(&transfer)])
BTreeSet::from([get_pending_key(transfer)])
},
Expect::False,
);
Expand All @@ -932,11 +932,11 @@ mod test_bridge_pool_vp {
SignedAmount::Positive(10.into()),
|transfer, log| {
log.write(
&get_pending_key(&transfer),
&get_pending_key(transfer),
transfer.try_to_vec().unwrap(),
)
.unwrap();
BTreeSet::from([get_pending_key(&transfer)])
BTreeSet::from([get_pending_key(transfer)])
},
Expect::False,
);
Expand All @@ -953,11 +953,11 @@ mod test_bridge_pool_vp {
SignedAmount::Positive(10.into()),
|transfer, log| {
log.write(
&get_pending_key(&transfer),
&get_pending_key(transfer),
transfer.try_to_vec().unwrap(),
)
.unwrap();
BTreeSet::from([get_pending_key(&transfer)])
BTreeSet::from([get_pending_key(transfer)])
},
Expect::False,
);
Expand All @@ -974,11 +974,11 @@ mod test_bridge_pool_vp {
SignedAmount::Positive(TOKENS.into()),
|transfer, log| {
log.write(
&get_pending_key(&transfer),
&get_pending_key(transfer),
transfer.try_to_vec().unwrap(),
)
.unwrap();
BTreeSet::from([get_pending_key(&transfer)])
BTreeSet::from([get_pending_key(transfer)])
},
Expect::False,
);
Expand All @@ -995,11 +995,11 @@ mod test_bridge_pool_vp {
SignedAmount::Negative(TOKENS.into()),
|transfer, log| {
log.write(
&get_pending_key(&transfer),
&get_pending_key(transfer),
transfer.try_to_vec().unwrap(),
)
.unwrap();
BTreeSet::from([get_pending_key(&transfer)])
BTreeSet::from([get_pending_key(transfer)])
},
Expect::False,
);
Expand All @@ -1014,7 +1014,7 @@ mod test_bridge_pool_vp {
SignedAmount::Positive(GAS_FEE.into()),
SignedAmount::Negative(TOKENS.into()),
SignedAmount::Positive(TOKENS.into()),
|transfer, _| BTreeSet::from([get_pending_key(&transfer)]),
|transfer, _| BTreeSet::from([get_pending_key(transfer)]),
Expect::Error,
);
}
Expand Down Expand Up @@ -1042,9 +1042,9 @@ mod test_bridge_pool_vp {
payer: bertha_address(),
},
};
log.write(&get_pending_key(&transfer), t.try_to_vec().unwrap())
log.write(&get_pending_key(transfer), t.try_to_vec().unwrap())
.unwrap();
BTreeSet::from([get_pending_key(&transfer)])
BTreeSet::from([get_pending_key(transfer)])
},
Expect::False,
);
Expand Down Expand Up @@ -1075,7 +1075,7 @@ mod test_bridge_pool_vp {
};
log.write(&get_pending_key(&t), transfer.try_to_vec().unwrap())
.unwrap();
BTreeSet::from([get_pending_key(&transfer)])
BTreeSet::from([get_pending_key(transfer)])
},
Expect::Error,
);
Expand All @@ -1092,12 +1092,12 @@ mod test_bridge_pool_vp {
SignedAmount::Positive(TOKENS.into()),
|transfer, log| {
log.write(
&get_pending_key(&transfer),
&get_pending_key(transfer),
transfer.try_to_vec().unwrap(),
)
.unwrap();
BTreeSet::from([
get_pending_key(&transfer),
get_pending_key(transfer),
get_signed_root_key(),
])
},
Expand Down

0 comments on commit 312a5cf

Please sign in to comment.