Skip to content

Commit c308c6b

Browse files
wpaulinowpaulino
committed
Replace hex::decode with FromHex
1 parent 4db95ee commit c308c6b

File tree

21 files changed

+491
-497
lines changed

21 files changed

+491
-497
lines changed

‎fuzz/src/full_stack.rs‎

Lines changed: 4 additions & 2 deletions
Large diffs are not rendered by default.

‎fuzz/src/onion_message.rs‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -206,6 +206,7 @@ impl SignerProvider for KeyProvider {
206206

207207
#[cfg(test)]
208208
mod tests {
209+
use bitcoin::hashes::hex::FromHex;
209210
use lightning::util::logger::{Logger, Record};
210211
use std::collections::HashMap;
211212
use std::sync::Mutex;
@@ -258,7 +259,7 @@ mod tests {
258259
000000000000000000000000000000000000000005600000000000000000000000000000000000000000000\
259260
000000000000000000";
260261
let logger = TrackingLogger { lines: Mutex::new(HashMap::new()) };
261-
super::do_test(&::hex::decode(one_hop_om).unwrap(), &logger);
262+
super::do_test(&<Vec<u8>>::from_hex(one_hop_om).unwrap(), &logger);
262263
{
263264
let log_entries = logger.lines.lock().unwrap();
264265
assert_eq!(log_entries.get(&("lightning::onion_message::messenger".to_string(),
@@ -302,7 +303,7 @@ mod tests {
302303
000000000000000000000000000000000000000004800000000000000000000000000000000000000000000\
303304
000000000000000000";
304305
let logger = TrackingLogger { lines: Mutex::new(HashMap::new()) };
305-
super::do_test(&::hex::decode(two_unblinded_hops_om).unwrap(), &logger);
306+
super::do_test(&<Vec<u8>>::from_hex(two_unblinded_hops_om).unwrap(), &logger);
306307
{
307308
let log_entries = logger.lines.lock().unwrap();
308309
assert_eq!(log_entries.get(&("lightning::onion_message::messenger".to_string(), "Forwarding an onion message to peer 020202020202020202020202020202020202020202020202020202020202020202".to_string())), Some(&1));
@@ -343,7 +344,7 @@ mod tests {
343344
000000000000000000000000000000000000000004800000000000000000000000000000000000000000000\
344345
000000000000000000";
345346
let logger = TrackingLogger { lines: Mutex::new(HashMap::new()) };
346-
super::do_test(&::hex::decode(two_unblinded_two_blinded_om).unwrap(), &logger);
347+
super::do_test(&<Vec<u8>>::from_hex(two_unblinded_two_blinded_om).unwrap(), &logger);
347348
{
348349
let log_entries = logger.lines.lock().unwrap();
349350
assert_eq!(log_entries.get(&("lightning::onion_message::messenger".to_string(), "Forwarding an onion message to peer 020202020202020202020202020202020202020202020202020202020202020202".to_string())), Some(&1));
@@ -384,7 +385,7 @@ mod tests {
384385
000000000000000000000000000000000000000004800000000000000000000000000000000000000000000\
385386
000000000000000000";
386387
let logger = TrackingLogger { lines: Mutex::new(HashMap::new()) };
387-
super::do_test(&::hex::decode(three_blinded_om).unwrap(), &logger);
388+
super::do_test(&<Vec<u8>>::from_hex(three_blinded_om).unwrap(), &logger);
388389
{
389390
let log_entries = logger.lines.lock().unwrap();
390391
assert_eq!(log_entries.get(&("lightning::onion_message::messenger".to_string(), "Forwarding an onion message to peer 020202020202020202020202020202020202020202020202020202020202020202".to_string())), Some(&1));

‎lightning-invoice/tests/ser_de.rs‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ extern crate hex;
77

88
use bitcoin::address::WitnessVersion;
99
use bitcoin::{PubkeyHash, ScriptHash};
10-
use bitcoin_hashes::hex::FromHex;
10+
use bitcoin::hashes::hex::FromHex;
1111
use bitcoin_hashes::{sha256, Hash};
1212
use lightning::ln::PaymentSecret;
1313
use lightning::routing::gossip::RoutingFees;
@@ -34,7 +34,7 @@ fn get_test_tuples() -> Vec<(String, SignedRawBolt11Invoice, bool, bool)> {
3434
.unwrap()
3535
.sign(|_| {
3636
RecoverableSignature::from_compact(
37-
&hex::decode("8d3ce9e28357337f62da0162d9454df827f83cfe499aeb1c1db349d4d81127425e434ca29929406c23bba1ae8ac6ca32880b38d4bf6ff874024cac34ba9625f1").unwrap(),
37+
&<Vec<u8>>::from_hex("8d3ce9e28357337f62da0162d9454df827f83cfe499aeb1c1db349d4d81127425e434ca29929406c23bba1ae8ac6ca32880b38d4bf6ff874024cac34ba9625f1").unwrap(),
3838
RecoveryId::from_i32(1).unwrap()
3939
)
4040
}).unwrap(),
@@ -56,7 +56,7 @@ fn get_test_tuples() -> Vec<(String, SignedRawBolt11Invoice, bool, bool)> {
5656
.unwrap()
5757
.sign(|_| {
5858
RecoverableSignature::from_compact(
59-
&hex::decode("e59e3ffbd3945e4334879158d31e89b076dff54f3fa7979ae79df2db9dcaf5896cbfe1a478b8d2307e92c88139464cb7e6ef26e414c4abe33337961ddc5e8ab1").unwrap(),
59+
&<Vec<u8>>::from_hex("e59e3ffbd3945e4334879158d31e89b076dff54f3fa7979ae79df2db9dcaf5896cbfe1a478b8d2307e92c88139464cb7e6ef26e414c4abe33337961ddc5e8ab1").unwrap(),
6060
RecoveryId::from_i32(1).unwrap()
6161
)
6262
}).unwrap(),
@@ -78,7 +78,7 @@ fn get_test_tuples() -> Vec<(String, SignedRawBolt11Invoice, bool, bool)> {
7878
.unwrap()
7979
.sign(|_| {
8080
RecoverableSignature::from_compact(
81-
&hex::decode("bae41ef385e0fc972977c7ea42b12cbd76577d2412919da8a8a22f9577b6507710c0e96dd78c821dea16453037f717f44aa7e3d196ebb18fbb97307dcb7336c3").unwrap(),
81+
&<Vec<u8>>::from_hex("bae41ef385e0fc972977c7ea42b12cbd76577d2412919da8a8a22f9577b6507710c0e96dd78c821dea16453037f717f44aa7e3d196ebb18fbb97307dcb7336c3").unwrap(),
8282
RecoveryId::from_i32(1).unwrap()
8383
)
8484
}).unwrap(),
@@ -99,7 +99,7 @@ fn get_test_tuples() -> Vec<(String, SignedRawBolt11Invoice, bool, bool)> {
9999
.unwrap()
100100
.sign(|_| {
101101
RecoverableSignature::from_compact(
102-
&hex::decode("f67a5f696648fa4fb102e1a07b230e54722f8e024cee71e80b4847ac191da3fb2d2cdb28cc32344d7e9a9cf5c9b6a0ee0582ae46e9938b9c81e344a4dbb5289d").unwrap(),
102+
&<Vec<u8>>::from_hex("f67a5f696648fa4fb102e1a07b230e54722f8e024cee71e80b4847ac191da3fb2d2cdb28cc32344d7e9a9cf5c9b6a0ee0582ae46e9938b9c81e344a4dbb5289d").unwrap(),
103103
RecoveryId::from_i32(1).unwrap()
104104
)
105105
}).unwrap(),
@@ -121,7 +121,7 @@ fn get_test_tuples() -> Vec<(String, SignedRawBolt11Invoice, bool, bool)> {
121121
.unwrap()
122122
.sign(|_| {
123123
RecoverableSignature::from_compact(
124-
&hex::decode("6ca95a74dc32e69ced6175b15a5cc56a92bf19f5dace0f134b7d94d464b9f5cf6090a18d48b243f289394d17bdf89466d8e6b37df5981f696bc3dd5986e1bee1").unwrap(),
124+
&<Vec<u8>>::from_hex("6ca95a74dc32e69ced6175b15a5cc56a92bf19f5dace0f134b7d94d464b9f5cf6090a18d48b243f289394d17bdf89466d8e6b37df5981f696bc3dd5986e1bee1").unwrap(),
125125
RecoveryId::from_i32(1).unwrap()
126126
)
127127
}).unwrap(),
@@ -140,15 +140,15 @@ fn get_test_tuples() -> Vec<(String, SignedRawBolt11Invoice, bool, bool)> {
140140
).unwrap())
141141
.fallback(Fallback::PubKeyHash(PubkeyHash::from_slice(&[4, 182, 31, 125, 193, 234, 13, 201, 148, 36, 70, 76, 196, 6, 77, 197, 100, 217, 30, 137]).unwrap()))
142142
.private_route(RouteHint(vec![RouteHintHop {
143-
src_node_id: PublicKey::from_slice(&hex::decode(
143+
src_node_id: PublicKey::from_slice(&<Vec<u8>>::from_hex(
144144
"029e03a901b85534ff1e92c43c74431f7ce72046060fcf7a95c37e148f78c77255"
145145
).unwrap()).unwrap(),
146146
short_channel_id: (66051 << 40) | (263430 << 16) | 1800,
147147
fees: RoutingFees { base_msat: 1, proportional_millionths: 20 },
148148
cltv_expiry_delta: 3,
149149
htlc_maximum_msat: None, htlc_minimum_msat: None,
150150
}, RouteHintHop {
151-
src_node_id: PublicKey::from_slice(&hex::decode(
151+
src_node_id: PublicKey::from_slice(&<Vec<u8>>::from_hex(
152152
"039e03a901b85534ff1e92c43c74431f7ce72046060fcf7a95c37e148f78c77255"
153153
).unwrap()).unwrap(),
154154
short_channel_id: (197637 << 40) | (395016 << 16) | 2314,
@@ -160,7 +160,7 @@ fn get_test_tuples() -> Vec<(String, SignedRawBolt11Invoice, bool, bool)> {
160160
.unwrap()
161161
.sign(|_| {
162162
RecoverableSignature::from_compact(
163-
&hex::decode("6a6586db4e8f6d40e3a5bb92e4df5110c627e9ce493af237e20a046b4e86ea200178c59564ecf892f33a9558bf041b6ad2cb8292d7a6c351fbb7f2ae2d16b54e").unwrap(),
163+
&<Vec<u8>>::from_hex("6a6586db4e8f6d40e3a5bb92e4df5110c627e9ce493af237e20a046b4e86ea200178c59564ecf892f33a9558bf041b6ad2cb8292d7a6c351fbb7f2ae2d16b54e").unwrap(),
164164
RecoveryId::from_i32(0).unwrap()
165165
)
166166
}).unwrap(),
@@ -182,7 +182,7 @@ fn get_test_tuples() -> Vec<(String, SignedRawBolt11Invoice, bool, bool)> {
182182
.unwrap()
183183
.sign(|_| {
184184
RecoverableSignature::from_compact(
185-
&hex::decode("16810439d1a9bfd5a65acc61340dc92448bb2d456a80b58ce012b73cb5202438020500c9ab7ef5573a4d174c811f669885ae27f895bb3a3be52c243589f87518").unwrap(),
185+
&<Vec<u8>>::from_hex("16810439d1a9bfd5a65acc61340dc92448bb2d456a80b58ce012b73cb5202438020500c9ab7ef5573a4d174c811f669885ae27f895bb3a3be52c243589f87518").unwrap(),
186186
RecoveryId::from_i32(1).unwrap()
187187
)
188188
}).unwrap(),
@@ -206,7 +206,7 @@ fn get_test_tuples() -> Vec<(String, SignedRawBolt11Invoice, bool, bool)> {
206206
.unwrap()
207207
.sign(|_| {
208208
RecoverableSignature::from_compact(
209-
&hex::decode("5a8bd7b97c1cc9055ee60cf2356621f8752248e037a953886a1782b44a58f5ff2d94e6bc89b7b514541a3603bb33722b6c08aa1a3639d34becc549a99fea6eae").unwrap(),
209+
&<Vec<u8>>::from_hex("5a8bd7b97c1cc9055ee60cf2356621f8752248e037a953886a1782b44a58f5ff2d94e6bc89b7b514541a3603bb33722b6c08aa1a3639d34becc549a99fea6eae").unwrap(),
210210
RecoveryId::from_i32(0).unwrap()
211211
)
212212
}).unwrap(),
@@ -230,7 +230,7 @@ fn get_test_tuples() -> Vec<(String, SignedRawBolt11Invoice, bool, bool)> {
230230
.unwrap()
231231
.sign(|_| {
232232
RecoverableSignature::from_compact(
233-
&hex::decode("2b3ec248f80301a421817369194f012cdd8af8df1c279981420f9e901e20fa3309d791e11355e609b59ce4a220852a0cd55ab862b1785a83b206c90fa74d01c8").unwrap(),
233+
&<Vec<u8>>::from_hex("2b3ec248f80301a421817369194f012cdd8af8df1c279981420f9e901e20fa3309d791e11355e609b59ce4a220852a0cd55ab862b1785a83b206c90fa74d01c8").unwrap(),
234234
RecoveryId::from_i32(1).unwrap()
235235
)
236236
}).unwrap(),
@@ -250,7 +250,7 @@ fn get_test_tuples() -> Vec<(String, SignedRawBolt11Invoice, bool, bool)> {
250250
.min_final_cltv_expiry_delta(10)
251251
.description("Blockstream Store: 88.85 USD for Blockstream Ledger Nano S x 1, \"Back In My Day\" Sticker x 2, \"I Got Lightning Working\" Sticker x 2 and 1 more items".to_owned())
252252
.private_route(RouteHint(vec![RouteHintHop {
253-
src_node_id: PublicKey::from_slice(&hex::decode(
253+
src_node_id: PublicKey::from_slice(&<Vec<u8>>::from_hex(
254254
"03d06758583bb5154774a6eb221b1276c9e82d65bbaceca806d90e20c108f4b1c7"
255255
).unwrap()).unwrap(),
256256
short_channel_id: (589390 << 40) | (3312 << 16) | 1,
@@ -262,7 +262,7 @@ fn get_test_tuples() -> Vec<(String, SignedRawBolt11Invoice, bool, bool)> {
262262
.unwrap()
263263
.sign(|_| {
264264
RecoverableSignature::from_compact(
265-
&hex::decode("1b1160cf6186b55722c1ac7ea502086baaccaabdc76b326e666b7f309d972b15069bfca11cd365304b36f48230cc12f3f13a017aab65f7c165a169df32282a58").unwrap(),
265+
&<Vec<u8>>::from_hex("1b1160cf6186b55722c1ac7ea502086baaccaabdc76b326e666b7f309d972b15069bfca11cd365304b36f48230cc12f3f13a017aab65f7c165a169df32282a58").unwrap(),
266266
RecoveryId::from_i32(1).unwrap()
267267
)
268268
}).unwrap(),
@@ -283,7 +283,7 @@ fn get_test_tuples() -> Vec<(String, SignedRawBolt11Invoice, bool, bool)> {
283283
.unwrap()
284284
.sign(|_| {
285285
RecoverableSignature::from_compact(
286-
&hex::decode("5755469bf4b8e6b6ae7a1308d5f9bad5c82812e0855cd24fac242aa323fa820c5c551ede4faeabcb7fb6d5a464ad0e35c86f615589ee0e0c250c216a662198c1").unwrap(),
286+
&<Vec<u8>>::from_hex("5755469bf4b8e6b6ae7a1308d5f9bad5c82812e0855cd24fac242aa323fa820c5c551ede4faeabcb7fb6d5a464ad0e35c86f615589ee0e0c250c216a662198c1").unwrap(),
287287
RecoveryId::from_i32(1).unwrap()
288288
)
289289
}).unwrap(),
@@ -304,7 +304,7 @@ fn get_test_tuples() -> Vec<(String, SignedRawBolt11Invoice, bool, bool)> {
304304
.unwrap()
305305
.sign(|_| {
306306
RecoverableSignature::from_compact(
307-
&hex::decode("5755469bf4b8e6b6ae7a1308d5f9bad5c82812e0855cd24fac242aa323fa820c5c551ede4faeabcb7fb6d5a464ad0e35c86f615589ee0e0c250c216a662198c1").unwrap(),
307+
&<Vec<u8>>::from_hex("5755469bf4b8e6b6ae7a1308d5f9bad5c82812e0855cd24fac242aa323fa820c5c551ede4faeabcb7fb6d5a464ad0e35c86f615589ee0e0c250c216a662198c1").unwrap(),
308308
RecoveryId::from_i32(1).unwrap()
309309
)
310310
}).unwrap(),
@@ -325,7 +325,7 @@ fn get_test_tuples() -> Vec<(String, SignedRawBolt11Invoice, bool, bool)> {
325325
.unwrap()
326326
.sign(|_| {
327327
RecoverableSignature::from_compact(
328-
&hex::decode("150a5252308f25bc2641a186de87470189bb003774326beee33b9a2a720d1584386631c5dda6fc3195f97464bfc93d2574868eadd767d6da1078329c4349c837").unwrap(),
328+
&<Vec<u8>>::from_hex("150a5252308f25bc2641a186de87470189bb003774326beee33b9a2a720d1584386631c5dda6fc3195f97464bfc93d2574868eadd767d6da1078329c4349c837").unwrap(),
329329
RecoveryId::from_i32(0).unwrap()
330330
)
331331
}).unwrap(),
@@ -341,17 +341,17 @@ fn get_test_tuples() -> Vec<(String, SignedRawBolt11Invoice, bool, bool)> {
341341
"0001020304050607080900010203040506070809000102030405060708090102"
342342
).unwrap())
343343
.description("payment metadata inside".to_owned())
344-
.payment_metadata(hex::decode("01fafaf0").unwrap())
344+
.payment_metadata(<Vec<u8>>::from_hex("01fafaf0").unwrap())
345345
.require_payment_metadata()
346-
.payee_pub_key(PublicKey::from_slice(&hex::decode(
346+
.payee_pub_key(PublicKey::from_slice(&<Vec<u8>>::from_hex(
347347
"03e7156ae33b0a208d0744199163177e909e80176e55d97a2f221ede0f934dd9ad"
348348
).unwrap()).unwrap())
349349
.payment_secret(PaymentSecret([0x11; 32]))
350350
.build_raw()
351351
.unwrap()
352352
.sign(|_| {
353353
RecoverableSignature::from_compact(
354-
&hex::decode("2150ed137ddb54f9736c6a0290ded709d22bddb7261d1d6518dffb467c6b1eef02afc182491bdacd00b65c83554c914a1c53c61b0a4ef04eccccdfb4365ed259").unwrap(),
354+
&<Vec<u8>>::from_hex("2150ed137ddb54f9736c6a0290ded709d22bddb7261d1d6518dffb467c6b1eef02afc182491bdacd00b65c83554c914a1c53c61b0a4ef04eccccdfb4365ed259").unwrap(),
355355
RecoveryId::from_i32(1).unwrap()
356356
)
357357
}).unwrap(),
@@ -367,14 +367,14 @@ fn get_test_tuples() -> Vec<(String, SignedRawBolt11Invoice, bool, bool)> {
367367
"0001020304050607080900010203040506070809000102030405060708090102"
368368
).unwrap())
369369
.description("payment metadata inside".to_owned())
370-
.payment_metadata(hex::decode("01fafaf0").unwrap())
370+
.payment_metadata(<Vec<u8>>::from_hex("01fafaf0").unwrap())
371371
.require_payment_metadata()
372372
.payment_secret(PaymentSecret([0x11; 32]))
373373
.build_raw()
374374
.unwrap()
375375
.sign(|_| {
376376
RecoverableSignature::from_compact(
377-
&hex::decode("f5d27be7d9c27d3aa521bc35d77cabd6bda18f1f61716445b19e27e4e17a887508ea8de5a8e1d94f561248f65434e61a221160dac1f1991b9c0f1057b269d898").unwrap(),
377+
&<Vec<u8>>::from_hex("f5d27be7d9c27d3aa521bc35d77cabd6bda18f1f61716445b19e27e4e17a887508ea8de5a8e1d94f561248f65434e61a221160dac1f1991b9c0f1057b269d898").unwrap(),
378378
RecoveryId::from_i32(1).unwrap()
379379
)
380380
}).unwrap(),

‎lightning/src/chain/channelmonitor.rs‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4495,8 +4495,6 @@ mod tests {
44954495
use bitcoin::secp256k1::{SecretKey,PublicKey};
44964496
use bitcoin::secp256k1::Secp256k1;
44974497

4498-
use hex;
4499-
45004498
use crate::chain::chaininterface::LowerBoundedFeeEstimator;
45014499

45024500
use super::ChannelMonitorUpdateStep;
@@ -4718,7 +4716,7 @@ mod tests {
47184716

47194717
// Now provide a secret, pruning preimages 10-15
47204718
let mut secret = [0; 32];
4721-
secret[0..32].clone_from_slice(&hex::decode("7cc854b54e3e0dcdb010d7a3fee464a9687be6e8db3be6854c475621e007a5dc").unwrap());
4719+
secret[0..32].clone_from_slice(&<Vec<u8>>::from_hex("7cc854b54e3e0dcdb010d7a3fee464a9687be6e8db3be6854c475621e007a5dc").unwrap());
47224720
monitor.provide_secret(281474976710655, secret.clone()).unwrap();
47234721
assert_eq!(monitor.inner.lock().unwrap().payment_preimages.len(), 15);
47244722
test_preimages_exist!(&preimages[0..10], monitor);
@@ -4728,7 +4726,7 @@ mod tests {
47284726
preimages_slice_to_htlc_outputs!(preimages[17..20]), 281474976710653, dummy_key, &logger);
47294727

47304728
// Now provide a further secret, pruning preimages 15-17
4731-
secret[0..32].clone_from_slice(&hex::decode("c7518c8ae4660ed02894df8976fa1a3659c1a8b4b5bec0c4b872abeba4cb8964").unwrap());
4729+
secret[0..32].clone_from_slice(&<Vec<u8>>::from_hex("c7518c8ae4660ed02894df8976fa1a3659c1a8b4b5bec0c4b872abeba4cb8964").unwrap());
47324730
monitor.provide_secret(281474976710654, secret.clone()).unwrap();
47334731
assert_eq!(monitor.inner.lock().unwrap().payment_preimages.len(), 13);
47344732
test_preimages_exist!(&preimages[0..10], monitor);
@@ -4743,7 +4741,7 @@ mod tests {
47434741
let dummy_commitment_tx = HolderCommitmentTransaction::dummy(&mut htlcs);
47444742
monitor.provide_latest_holder_commitment_tx(dummy_commitment_tx.clone(),
47454743
htlcs.into_iter().map(|(htlc, _)| (htlc, Some(dummy_sig), None)).collect()).unwrap();
4746-
secret[0..32].clone_from_slice(&hex::decode("2273e227a5b7449b6e70f1fb4652864038b1cbf9cd7c043a7d6456b7fc275ad8").unwrap());
4744+
secret[0..32].clone_from_slice(&<Vec<u8>>::from_hex("2273e227a5b7449b6e70f1fb4652864038b1cbf9cd7c043a7d6456b7fc275ad8").unwrap());
47474745
monitor.provide_secret(281474976710653, secret.clone()).unwrap();
47484746
assert_eq!(monitor.inner.lock().unwrap().payment_preimages.len(), 12);
47494747
test_preimages_exist!(&preimages[0..10], monitor);
@@ -4754,7 +4752,7 @@ mod tests {
47544752
let dummy_commitment_tx = HolderCommitmentTransaction::dummy(&mut htlcs);
47554753
monitor.provide_latest_holder_commitment_tx(dummy_commitment_tx,
47564754
htlcs.into_iter().map(|(htlc, _)| (htlc, Some(dummy_sig), None)).collect()).unwrap();
4757-
secret[0..32].clone_from_slice(&hex::decode("27cddaa5624534cb6cb9d7da077cf2b22ab21e9b506fd4998a51d54502e99116").unwrap());
4755+
secret[0..32].clone_from_slice(&<Vec<u8>>::from_hex("27cddaa5624534cb6cb9d7da077cf2b22ab21e9b506fd4998a51d54502e99116").unwrap());
47584756
monitor.provide_secret(281474976710652, secret.clone()).unwrap();
47594757
assert_eq!(monitor.inner.lock().unwrap().payment_preimages.len(), 5);
47604758
test_preimages_exist!(&preimages[0..5], monitor);
@@ -4766,7 +4764,7 @@ mod tests {
47664764
// not actual case to avoid sigs and time-lock delays hell variances.
47674765

47684766
let secp_ctx = Secp256k1::new();
4769-
let privkey = SecretKey::from_slice(&hex::decode("0101010101010101010101010101010101010101010101010101010101010101").unwrap()[..]).unwrap();
4767+
let privkey = SecretKey::from_slice(&<Vec<u8>>::from_hex("0101010101010101010101010101010101010101010101010101010101010101").unwrap()[..]).unwrap();
47704768
let pubkey = PublicKey::from_secret_key(&secp_ctx, &privkey);
47714769

47724770
macro_rules! sign_input {

‎lightning/src/chain/package.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1207,7 +1207,7 @@ mod tests {
12071207
macro_rules! dumb_revk_output {
12081208
($secp_ctx: expr, $is_counterparty_balance_on_anchors: expr) => {
12091209
{
1210-
let dumb_scalar = SecretKey::from_slice(&hex::decode("0101010101010101010101010101010101010101010101010101010101010101").unwrap()[..]).unwrap();
1210+
let dumb_scalar = SecretKey::from_slice(&<Vec<u8>>::from_hex("0101010101010101010101010101010101010101010101010101010101010101").unwrap()[..]).unwrap();
12111211
let dumb_point = PublicKey::from_secret_key(&$secp_ctx, &dumb_scalar);
12121212
PackageSolvingData::RevokedOutput(RevokedOutput::build(dumb_point, dumb_point, dumb_point, dumb_scalar, 0, 0, $is_counterparty_balance_on_anchors))
12131213
}
@@ -1217,7 +1217,7 @@ mod tests {
12171217
macro_rules! dumb_counterparty_output {
12181218
($secp_ctx: expr, $amt: expr, $opt_anchors: expr) => {
12191219
{
1220-
let dumb_scalar = SecretKey::from_slice(&hex::decode("0101010101010101010101010101010101010101010101010101010101010101").unwrap()[..]).unwrap();
1220+
let dumb_scalar = SecretKey::from_slice(&<Vec<u8>>::from_hex("0101010101010101010101010101010101010101010101010101010101010101").unwrap()[..]).unwrap();
12211221
let dumb_point = PublicKey::from_secret_key(&$secp_ctx, &dumb_scalar);
12221222
let hash = PaymentHash([1; 32]);
12231223
let htlc = HTLCOutputInCommitment { offered: true, amount_msat: $amt, cltv_expiry: 0, payment_hash: hash, transaction_output_index: None };
@@ -1229,7 +1229,7 @@ mod tests {
12291229
macro_rules! dumb_counterparty_offered_output {
12301230
($secp_ctx: expr, $amt: expr, $opt_anchors: expr) => {
12311231
{
1232-
let dumb_scalar = SecretKey::from_slice(&hex::decode("0101010101010101010101010101010101010101010101010101010101010101").unwrap()[..]).unwrap();
1232+
let dumb_scalar = SecretKey::from_slice(&<Vec<u8>>::from_hex("0101010101010101010101010101010101010101010101010101010101010101").unwrap()[..]).unwrap();
12331233
let dumb_point = PublicKey::from_secret_key(&$secp_ctx, &dumb_scalar);
12341234
let hash = PaymentHash([1; 32]);
12351235
let preimage = PaymentPreimage([2;32]);

0 commit comments

Comments
 (0)