absolutebi/serai
1
0
Fork 0
mirror of https://github.com/serai-dex/serai.git synced 2025-12-08 20:29:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Convert the FeaturedAddress tuple to a struct

Browse Source 
Not only did we already have multiple booleans in it, yet it theoretically
could expand in the future. Not only is this more explicit, it actually cleans
some existing code.
This commit is contained in:
Luke Parker
2023-01-07 05:37:43 -05:00
parent 7b0b8a20ec
commit 4be3290e40
5 changed files with 93 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
coins/monero/tests/scan.rs
View File

@@ -68,8 +68,13 @@ test!(
|_, mut builder: Builder, _| async move {
let view = runner::random_address().1;
let scanner = Scanner::from_view(view.clone(), Some(HashSet::new()));
builder
.add_payment(view.address(Network::Mainnet, AddressSpec::Featured(None, None, false)), 5);
builder.add_payment(
view.address(
Network::Mainnet,
AddressSpec::Featured { subaddress: None, payment_id: None, guaranteed: false },
),
5,
);
(builder.build().unwrap(), scanner)
},
|_, tx: Transaction, _, mut state: Scanner| async move {
@@ -90,7 +95,14 @@ test!(
scanner.register_subaddress(subaddress);
builder.add_payment(
view.address(Network::Mainnet, AddressSpec::Featured(Some(subaddress), None, false)),
view.address(
Network::Mainnet,
AddressSpec::Featured {
subaddress: Some(subaddress),
payment_id: None,
guaranteed: false,
},
),
5,
);
(builder.build().unwrap(), (scanner, subaddress))
@@ -113,7 +125,14 @@ test!(
OsRng.fill_bytes(&mut payment_id);
builder.add_payment(
view.address(Network::Mainnet, AddressSpec::Featured(None, Some(payment_id), false)),
view.address(
Network::Mainnet,
AddressSpec::Featured {
subaddress: None,
payment_id: Some(payment_id),
guaranteed: false,
},
),
5,
);
(builder.build().unwrap(), (scanner, payment_id))
@@ -142,7 +161,11 @@ test!(
builder.add_payment(
view.address(
Network::Mainnet,
AddressSpec::Featured(Some(subaddress), Some(payment_id), false),
AddressSpec::Featured {
subaddress: Some(subaddress),
payment_id: Some(payment_id),
guaranteed: false,
},
),
5,
);
@@ -164,8 +187,13 @@ test!(
let view = runner::random_address().1;
let scanner = Scanner::from_view(view.clone(), None);
builder
.add_payment(view.address(Network::Mainnet, AddressSpec::Featured(None, None, true)), 5);
builder.add_payment(
view.address(
Network::Mainnet,
AddressSpec::Featured { subaddress: None, payment_id: None, guaranteed: true },
),
5,
);
(builder.build().unwrap(), scanner)
},
|_, tx: Transaction, _, mut state: Scanner| async move {
@@ -186,7 +214,14 @@ test!(
scanner.register_subaddress(subaddress);
builder.add_payment(
view.address(Network::Mainnet, AddressSpec::Featured(Some(subaddress), None, true)),
view.address(
Network::Mainnet,
AddressSpec::Featured {
subaddress: Some(subaddress),
payment_id: None,
guaranteed: true,
},
),
5,
);
(builder.build().unwrap(), (scanner, subaddress))
@@ -209,7 +244,14 @@ test!(
OsRng.fill_bytes(&mut payment_id);
builder.add_payment(
view.address(Network::Mainnet, AddressSpec::Featured(None, Some(payment_id), true)),
view.address(
Network::Mainnet,
AddressSpec::Featured {
subaddress: None,
payment_id: Some(payment_id),
guaranteed: true,
},
),
5,
);
(builder.build().unwrap(), (scanner, payment_id))
@@ -238,7 +280,11 @@ test!(
builder.add_payment(
view.address(
Network::Mainnet,
AddressSpec::Featured(Some(subaddress), Some(payment_id), true),
AddressSpec::Featured {
subaddress: Some(subaddress),
payment_id: Some(payment_id),
guaranteed: true,
},
),
5,
);