Skip to content

Commit fd060fb

Browse files
jkczyzjkczyz
committed
f - rustfmt
1 parent 535fa47 commit fd060fb

File tree

2 files changed

+59
-43
lines changed

2 files changed

+59
-43
lines changed

‎fuzz/src/invoice_request_deser.rs

Lines changed: 31 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,10 @@
1010
use crate::utils::test_logger;
1111
use bitcoin::secp256k1::{self, Keypair, Parity, PublicKey, Secp256k1, SecretKey};
1212
use core::convert::TryFrom;
13-
use lightning::blinded_path::payment::{Bolt12OfferContext, ForwardNode, ForwardTlvs, PaymentConstraints, PaymentContext, PaymentRelay, ReceiveTlvs};
13+
use lightning::blinded_path::payment::{
14+
Bolt12OfferContext, ForwardNode, ForwardTlvs, PaymentConstraints, PaymentContext, PaymentRelay,
15+
ReceiveTlvs,
16+
};
1417
use lightning::blinded_path::BlindedPath;
1518
use lightning::ln::channelmanager::MIN_FINAL_CLTV_EXPIRY_DELTA;
1619
use lightning::ln::features::BlindedHopFeatures;
@@ -85,7 +88,9 @@ fn build_response<T: secp256k1::Signing + secp256k1::Verification>(
8588
invoice_request: InvoiceRequestFields {
8689
payer_id: invoice_request.payer_id(),
8790
quantity: invoice_request.quantity(),
88-
payer_note_truncated: invoice_request.payer_note().map(|s| UntrustedString(s.to_string())),
91+
payer_note_truncated: invoice_request
92+
.payer_note()
93+
.map(|s| UntrustedString(s.to_string())),
8994
},
9095
});
9196
let payee_tlvs = ReceiveTlvs {
@@ -96,29 +101,33 @@ fn build_response<T: secp256k1::Signing + secp256k1::Verification>(
96101
},
97102
payment_context,
98103
};
99-
let intermediate_nodes = [
100-
ForwardNode {
101-
tlvs: ForwardTlvs {
102-
short_channel_id: 43,
103-
payment_relay: PaymentRelay {
104-
cltv_expiry_delta: 40,
105-
fee_proportional_millionths: 1_000,
106-
fee_base_msat: 1,
107-
},
108-
payment_constraints: PaymentConstraints {
109-
max_cltv_expiry: payee_tlvs.payment_constraints.max_cltv_expiry + 40,
110-
htlc_minimum_msat: 100,
111-
},
112-
features: BlindedHopFeatures::empty(),
104+
let intermediate_nodes = [ForwardNode {
105+
tlvs: ForwardTlvs {
106+
short_channel_id: 43,
107+
payment_relay: PaymentRelay {
108+
cltv_expiry_delta: 40,
109+
fee_proportional_millionths: 1_000,
110+
fee_base_msat: 1,
113111
},
114-
node_id: pubkey(43),
115-
htlc_maximum_msat: 1_000_000_000_000,
112+
payment_constraints: PaymentConstraints {
113+
max_cltv_expiry: payee_tlvs.payment_constraints.max_cltv_expiry + 40,
114+
htlc_minimum_msat: 100,
115+
},
116+
features: BlindedHopFeatures::empty(),
116117
},
117-
];
118+
node_id: pubkey(43),
119+
htlc_maximum_msat: 1_000_000_000_000,
120+
}];
118121
let payment_path = BlindedPath::new_for_payment(
119-
&intermediate_nodes, pubkey(42), payee_tlvs, u64::MAX, MIN_FINAL_CLTV_EXPIRY_DELTA,
120-
&entropy_source, secp_ctx,
121-
).unwrap();
122+
&intermediate_nodes,
123+
pubkey(42),
124+
payee_tlvs,
125+
u64::MAX,
126+
MIN_FINAL_CLTV_EXPIRY_DELTA,
127+
&entropy_source,
128+
secp_ctx,
129+
)
130+
.unwrap();
122131

123132
let payment_hash = PaymentHash([42; 32]);
124133
invoice_request.respond_with(vec![payment_path], payment_hash)?.build()

‎fuzz/src/refund_deser.rs

Lines changed: 28 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,10 @@
1010
use crate::utils::test_logger;
1111
use bitcoin::secp256k1::{self, Keypair, PublicKey, Secp256k1, SecretKey};
1212
use core::convert::TryFrom;
13-
use lightning::blinded_path::payment::{Bolt12RefundContext, ForwardNode, ForwardTlvs, PaymentConstraints, PaymentContext, PaymentRelay, ReceiveTlvs};
13+
use lightning::blinded_path::payment::{
14+
Bolt12RefundContext, ForwardNode, ForwardTlvs, PaymentConstraints, PaymentContext,
15+
PaymentRelay, ReceiveTlvs,
16+
};
1417
use lightning::blinded_path::BlindedPath;
1518
use lightning::ln::channelmanager::MIN_FINAL_CLTV_EXPIRY_DELTA;
1619
use lightning::ln::features::BlindedHopFeatures;
@@ -76,29 +79,33 @@ fn build_response<T: secp256k1::Signing + secp256k1::Verification>(
7679
},
7780
payment_context,
7881
};
79-
let intermediate_nodes = [
80-
ForwardNode {
81-
tlvs: ForwardTlvs {
82-
short_channel_id: 43,
83-
payment_relay: PaymentRelay {
84-
cltv_expiry_delta: 40,
85-
fee_proportional_millionths: 1_000,
86-
fee_base_msat: 1,
87-
},
88-
payment_constraints: PaymentConstraints {
89-
max_cltv_expiry: payee_tlvs.payment_constraints.max_cltv_expiry + 40,
90-
htlc_minimum_msat: 100,
91-
},
92-
features: BlindedHopFeatures::empty(),
82+
let intermediate_nodes = [ForwardNode {
83+
tlvs: ForwardTlvs {
84+
short_channel_id: 43,
85+
payment_relay: PaymentRelay {
86+
cltv_expiry_delta: 40,
87+
fee_proportional_millionths: 1_000,
88+
fee_base_msat: 1,
9389
},
94-
node_id: pubkey(43),
95-
htlc_maximum_msat: 1_000_000_000_000,
90+
payment_constraints: PaymentConstraints {
91+
max_cltv_expiry: payee_tlvs.payment_constraints.max_cltv_expiry + 40,
92+
htlc_minimum_msat: 100,
93+
},
94+
features: BlindedHopFeatures::empty(),
9695
},
97-
];
96+
node_id: pubkey(43),
97+
htlc_maximum_msat: 1_000_000_000_000,
98+
}];
9899
let payment_path = BlindedPath::new_for_payment(
99-
&intermediate_nodes, pubkey(42), payee_tlvs, u64::MAX, MIN_FINAL_CLTV_EXPIRY_DELTA,
100-
&entropy_source, secp_ctx,
101-
).unwrap();
100+
&intermediate_nodes,
101+
pubkey(42),
102+
payee_tlvs,
103+
u64::MAX,
104+
MIN_FINAL_CLTV_EXPIRY_DELTA,
105+
&entropy_source,
106+
secp_ctx,
107+
)
108+
.unwrap();
102109

103110
let payment_hash = PaymentHash([42; 32]);
104111
refund.respond_with(vec![payment_path], payment_hash, signing_pubkey)?.build()

0 commit comments

Comments
 (0)