Skip to content

Commit 487d6a0

Browse files
Fix silent rebase conflict that broke tests
429cbe1 merged a PR that renamed Offer::signing_pubkey to Offer::issuer_signing_pubkey. However, there was a silent rebase conflict and a test added as part of 1059f5f did not get the memo and used the old method name, breaking the test build.
1 parent 815d255 commit 487d6a0

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

lightning/src/ln/offers_tests.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2287,7 +2287,7 @@ fn no_double_pay_with_stale_channelmanager() {
22872287
.clear_paths()
22882288
.amount_msats(amt_msat)
22892289
.build().unwrap();
2290-
assert_eq!(offer.signing_pubkey(), Some(bob_id));
2290+
assert_eq!(offer.issuer_signing_pubkey(), Some(bob_id));
22912291
assert!(offer.paths().is_empty());
22922292

22932293
let payment_id = PaymentId([1; 32]);

0 commit comments

Comments
 (0)