Skip to content

Commit 0912b51

Browse files
jkczyzjkczyz
committed
Drop use of reserve_exact in BOLT12 tests
Now that the previous commit removed assertions on Vec capacities for BOLT12 messages, the use of reserve_exact in tests is no longer needed.
1 parent ffaccc0 commit 0912b51

3 files changed

Lines changed: 0 additions & 44 deletions

File tree

‎lightning/src/offers/invoice.rs‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2851,9 +2851,6 @@ mod tests {
28512851
BigSize(32).write(&mut unknown_bytes).unwrap();
28522852
[42u8; 32].write(&mut unknown_bytes).unwrap();
28532853

2854-
unsigned_invoice.bytes.reserve_exact(
2855-
unsigned_invoice.bytes.capacity() - unsigned_invoice.bytes.len() + unknown_bytes.len(),
2856-
);
28572854
unsigned_invoice.bytes.extend_from_slice(&unknown_bytes);
28582855
unsigned_invoice.tagged_hash =
28592856
TaggedHash::from_valid_tlv_stream_bytes(SIGNATURE_TAG, &unsigned_invoice.bytes);
@@ -2888,9 +2885,6 @@ mod tests {
28882885
BigSize(32).write(&mut unknown_bytes).unwrap();
28892886
[42u8; 32].write(&mut unknown_bytes).unwrap();
28902887

2891-
unsigned_invoice.bytes.reserve_exact(
2892-
unsigned_invoice.bytes.capacity() - unsigned_invoice.bytes.len() + unknown_bytes.len(),
2893-
);
28942888
unsigned_invoice.bytes.extend_from_slice(&unknown_bytes);
28952889
unsigned_invoice.tagged_hash =
28962890
TaggedHash::from_valid_tlv_stream_bytes(SIGNATURE_TAG, &unsigned_invoice.bytes);
@@ -2953,9 +2947,6 @@ mod tests {
29532947
BigSize(32).write(&mut unknown_bytes).unwrap();
29542948
[42u8; 32].write(&mut unknown_bytes).unwrap();
29552949

2956-
unsigned_invoice.bytes.reserve_exact(
2957-
unsigned_invoice.bytes.capacity() - unsigned_invoice.bytes.len() + unknown_bytes.len(),
2958-
);
29592950
unsigned_invoice.experimental_bytes.extend_from_slice(&unknown_bytes);
29602951

29612952
let tlv_stream = TlvStream::new(&unsigned_invoice.bytes)
@@ -2992,9 +2983,6 @@ mod tests {
29922983
BigSize(32).write(&mut unknown_bytes).unwrap();
29932984
[42u8; 32].write(&mut unknown_bytes).unwrap();
29942985

2995-
unsigned_invoice.bytes.reserve_exact(
2996-
unsigned_invoice.bytes.capacity() - unsigned_invoice.bytes.len() + unknown_bytes.len(),
2997-
);
29982986
unsigned_invoice.experimental_bytes.extend_from_slice(&unknown_bytes);
29992987

30002988
let tlv_stream = TlvStream::new(&unsigned_invoice.bytes)

‎lightning/src/offers/invoice_request.rs‎

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -2403,11 +2403,6 @@ mod tests {
24032403
BigSize(32).write(&mut unknown_bytes).unwrap();
24042404
[42u8; 32].write(&mut unknown_bytes).unwrap();
24052405

2406-
unsigned_invoice_request.bytes.reserve_exact(
2407-
unsigned_invoice_request.bytes.capacity()
2408-
- unsigned_invoice_request.bytes.len()
2409-
+ unknown_bytes.len(),
2410-
);
24112406
unsigned_invoice_request.bytes.extend_from_slice(&unknown_bytes);
24122407
unsigned_invoice_request.tagged_hash =
24132408
TaggedHash::from_valid_tlv_stream_bytes(SIGNATURE_TAG, &unsigned_invoice_request.bytes);
@@ -2441,11 +2436,6 @@ mod tests {
24412436
BigSize(32).write(&mut unknown_bytes).unwrap();
24422437
[42u8; 32].write(&mut unknown_bytes).unwrap();
24432438

2444-
unsigned_invoice_request.bytes.reserve_exact(
2445-
unsigned_invoice_request.bytes.capacity()
2446-
- unsigned_invoice_request.bytes.len()
2447-
+ unknown_bytes.len(),
2448-
);
24492439
unsigned_invoice_request.bytes.extend_from_slice(&unknown_bytes);
24502440
unsigned_invoice_request.tagged_hash =
24512441
TaggedHash::from_valid_tlv_stream_bytes(SIGNATURE_TAG, &unsigned_invoice_request.bytes);
@@ -2489,11 +2479,6 @@ mod tests {
24892479
BigSize(32).write(&mut unknown_bytes).unwrap();
24902480
[42u8; 32].write(&mut unknown_bytes).unwrap();
24912481

2492-
unsigned_invoice_request.bytes.reserve_exact(
2493-
unsigned_invoice_request.bytes.capacity()
2494-
- unsigned_invoice_request.bytes.len()
2495-
+ unknown_bytes.len(),
2496-
);
24972482
unsigned_invoice_request.experimental_bytes.extend_from_slice(&unknown_bytes);
24982483

24992484
let tlv_stream = TlvStream::new(&unsigned_invoice_request.bytes)
@@ -2530,11 +2515,6 @@ mod tests {
25302515
BigSize(32).write(&mut unknown_bytes).unwrap();
25312516
[42u8; 32].write(&mut unknown_bytes).unwrap();
25322517

2533-
unsigned_invoice_request.bytes.reserve_exact(
2534-
unsigned_invoice_request.bytes.capacity()
2535-
- unsigned_invoice_request.bytes.len()
2536-
+ unknown_bytes.len(),
2537-
);
25382518
unsigned_invoice_request.experimental_bytes.extend_from_slice(&unknown_bytes);
25392519

25402520
let tlv_stream = TlvStream::new(&unsigned_invoice_request.bytes)

‎lightning/src/offers/static_invoice.rs‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1371,9 +1371,6 @@ mod tests {
13711371
BigSize(32).write(&mut unknown_bytes).unwrap();
13721372
[42u8; 32].write(&mut unknown_bytes).unwrap();
13731373

1374-
unsigned_invoice.bytes.reserve_exact(
1375-
unsigned_invoice.bytes.capacity() - unsigned_invoice.bytes.len() + unknown_bytes.len(),
1376-
);
13771374
unsigned_invoice.bytes.extend_from_slice(&unknown_bytes);
13781375
unsigned_invoice.tagged_hash =
13791376
TaggedHash::from_valid_tlv_stream_bytes(SIGNATURE_TAG, &unsigned_invoice.bytes);
@@ -1413,9 +1410,6 @@ mod tests {
14131410
BigSize(32).write(&mut unknown_bytes).unwrap();
14141411
[42u8; 32].write(&mut unknown_bytes).unwrap();
14151412

1416-
unsigned_invoice.bytes.reserve_exact(
1417-
unsigned_invoice.bytes.capacity() - unsigned_invoice.bytes.len() + unknown_bytes.len(),
1418-
);
14191413
unsigned_invoice.bytes.extend_from_slice(&unknown_bytes);
14201414
unsigned_invoice.tagged_hash =
14211415
TaggedHash::from_valid_tlv_stream_bytes(SIGNATURE_TAG, &unsigned_invoice.bytes);
@@ -1490,9 +1484,6 @@ mod tests {
14901484
BigSize(32).write(&mut unknown_bytes).unwrap();
14911485
[42u8; 32].write(&mut unknown_bytes).unwrap();
14921486

1493-
unsigned_invoice.bytes.reserve_exact(
1494-
unsigned_invoice.bytes.capacity() - unsigned_invoice.bytes.len() + unknown_bytes.len(),
1495-
);
14961487
unsigned_invoice.experimental_bytes.extend_from_slice(&unknown_bytes);
14971488

14981489
let tlv_stream = TlvStream::new(&unsigned_invoice.bytes)
@@ -1534,9 +1525,6 @@ mod tests {
15341525
BigSize(32).write(&mut unknown_bytes).unwrap();
15351526
[42u8; 32].write(&mut unknown_bytes).unwrap();
15361527

1537-
unsigned_invoice.bytes.reserve_exact(
1538-
unsigned_invoice.bytes.capacity() - unsigned_invoice.bytes.len() + unknown_bytes.len(),
1539-
);
15401528
unsigned_invoice.experimental_bytes.extend_from_slice(&unknown_bytes);
15411529

15421530
let tlv_stream = TlvStream::new(&unsigned_invoice.bytes)

0 commit comments

Comments
 (0)