]> git.bitcoin.ninja Git - rust-lightning/commitdiff
Fix silent rebase conflict that broke tests
authorValentine Wallace <vwallace@protonmail.com>
Tue, 17 Sep 2024 21:24:39 +0000 (17:24 -0400)
committerValentine Wallace <vwallace@protonmail.com>
Tue, 17 Sep 2024 21:24:42 +0000 (17:24 -0400)
429cbe1a060a5ee7abb421c65d2cf5e503909215 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
1059f5ffc55d3c21bf4d3ae82fe185f588a53116 did not get the memo and used the old
method name, breaking the test build.

lightning/src/ln/offers_tests.rs

index a9805cfedf58a59ec6d6d565ba3aeb680ffa1814..9ea8856f82a4785a1e7eeee3f8c1cd4587dcb1ce 100644 (file)
@@ -2287,7 +2287,7 @@ fn no_double_pay_with_stale_channelmanager() {
                .clear_paths()
                .amount_msats(amt_msat)
                .build().unwrap();
-       assert_eq!(offer.signing_pubkey(), Some(bob_id));
+       assert_eq!(offer.issuer_signing_pubkey(), Some(bob_id));
        assert!(offer.paths().is_empty());
 
        let payment_id = PaymentId([1; 32]);