From 659549a5fc118b82543d9196e40ad5ebfb791108 Mon Sep 17 00:00:00 2001 From: Elle Mouton Date: Fri, 23 May 2025 16:11:27 +0200 Subject: [PATCH] chanbackup: make sure onion addresses are covered in tests --- chanbackup/backup_test.go | 1 + chanbackup/multi_test.go | 2 +- chanbackup/single_test.go | 9 +++++++-- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/chanbackup/backup_test.go b/chanbackup/backup_test.go index 46ccf4c24..46696da76 100644 --- a/chanbackup/backup_test.go +++ b/chanbackup/backup_test.go @@ -156,6 +156,7 @@ func TestFetchStaticChanBackups(t *testing.T) { chanSource.chans[randomChan2.FundingOutpoint] = randomChan2 chanSource.addAddrsForNode(randomChan1.IdentityPub, []net.Addr{addr1}) chanSource.addAddrsForNode(randomChan2.IdentityPub, []net.Addr{addr2}) + chanSource.addAddrsForNode(randomChan2.IdentityPub, []net.Addr{addr3}) // With the channel source populated, we'll now attempt to create a set // of backups for all the channels. This should succeed, as all items diff --git a/chanbackup/multi_test.go b/chanbackup/multi_test.go index a296f914e..eeff81788 100644 --- a/chanbackup/multi_test.go +++ b/chanbackup/multi_test.go @@ -22,7 +22,7 @@ func TestMultiPackUnpack(t *testing.T) { t.Fatalf("unable to gen channel: %v", err) } - single := NewSingle(channel, []net.Addr{addr1, addr2}) + single := NewSingle(channel, []net.Addr{addr1, addr2, addr3}) originalSingles = append(originalSingles, single) multi.StaticBackups = append(multi.StaticBackups, single) diff --git a/chanbackup/single_test.go b/chanbackup/single_test.go index 0fe402926..78957f38b 100644 --- a/chanbackup/single_test.go +++ b/chanbackup/single_test.go @@ -18,6 +18,7 @@ import ( "github.com/lightningnetwork/lnd/lnencrypt" "github.com/lightningnetwork/lnd/lnwire" "github.com/lightningnetwork/lnd/shachain" + "github.com/lightningnetwork/lnd/tor" "github.com/stretchr/testify/require" ) @@ -36,6 +37,10 @@ var ( addr1, _ = net.ResolveTCPAddr("tcp", "10.0.0.2:9000") addr2, _ = net.ResolveTCPAddr("tcp", "10.0.0.3:9000") + addr3 = &tor.OnionAddr{ + OnionService: "3g2upl4pq6kufc4m.onion", + Port: 9735, + } ) func assertSingleEqual(t *testing.T, a, b Single) { @@ -309,7 +314,7 @@ func TestSinglePackUnpack(t *testing.T) { channel, err := genRandomOpenChannelShell() require.NoError(t, err, "unable to gen open channel") - singleChanBackup := NewSingle(channel, []net.Addr{addr1, addr2}) + singleChanBackup := NewSingle(channel, []net.Addr{addr1, addr2, addr3}) keyRing := &lnencrypt.MockKeyRing{} @@ -634,7 +639,7 @@ func TestSingleUnconfirmedChannel(t *testing.T) { channel.ShortChannelID.BlockHeight = 0 channel.FundingBroadcastHeight = fundingBroadcastHeight - singleChanBackup := NewSingle(channel, []net.Addr{addr1, addr2}) + singleChanBackup := NewSingle(channel, []net.Addr{addr1, addr2, addr3}) keyRing := &lnencrypt.MockKeyRing{} // Pack it and then unpack it again to make sure everything is written