itest: use LND as sender

breez · Nov 21, 2024 · 9943d59 · 9943d59
1 parent 55c2b89
commit 9943d59
Show file tree

Hide file tree

Showing 15 changed files with 18 additions and 22 deletions.
diff --git a/itest/bob_offline_test.go b/itest/bob_offline_test.go
@@ -10,7 +10,7 @@ import (
 )
 
 func testFailureBobOffline(p *testParams) {
-	alice := lntest.NewClnNode(p.h, p.m, "Alice")
+	alice := lntest.NewLndNode(p.h, p.m, "Alice")
 	alice.Start()
 	alice.Fund(10000000)
 	p.lsp.LightningNode().Fund(10000000)

diff --git a/itest/cltv_test.go b/itest/cltv_test.go
@@ -10,7 +10,7 @@ import (
 )
 
 func testInvalidCltv(p *testParams) {
-	alice := lntest.NewClnNode(p.h, p.m, "Alice")
+	alice := lntest.NewLndNode(p.h, p.m, "Alice")
 	alice.Start()
 	alice.Fund(10000000)
 	p.lsp.LightningNode().Fund(10000000)

diff --git a/itest/dynamic_fee_test.go b/itest/dynamic_fee_test.go
@@ -10,7 +10,7 @@ import (
 )
 
 func testDynamicFeeFlow(p *testParams) {
-	alice := lntest.NewClnNode(p.h, p.m, "Alice")
+	alice := lntest.NewLndNode(p.h, p.m, "Alice")
 	alice.Start()
 	alice.Fund(10000000)
 	p.lsp.LightningNode().Fund(10000000)

diff --git a/itest/intercept_zero_conf_test.go b/itest/intercept_zero_conf_test.go
@@ -12,7 +12,7 @@ import (
 var htlcInterceptorDelay = time.Second * 7
 
 func testOpenZeroConfChannelOnReceive(p *testParams) {
-	alice := lntest.NewClnNode(p.h, p.m, "Alice")
+	alice := lntest.NewLndNode(p.h, p.m, "Alice")
 	alice.Start()
 	alice.Fund(10000000)
 	p.lsp.LightningNode().Fund(10000000)
@@ -66,7 +66,7 @@ func testOpenZeroConfChannelOnReceive(p *testParams) {
 }
 
 func testOpenZeroConfSingleHtlc(p *testParams) {
-	alice := lntest.NewClnNode(p.h, p.m, "Alice")
+	alice := lntest.NewLndNode(p.h, p.m, "Alice")
 	alice.Start()
 	alice.Fund(10000000)
 	p.lsp.LightningNode().Fund(10000000)

diff --git a/itest/lntest/lnd_node.go b/itest/lntest/lnd_node.go
@@ -472,11 +472,7 @@ func (n *LndNode) WaitForChannelReady(channel *ChannelInfo) ShortChannelID {
 		if index >= 0 {
 			c := lc.Channels[index]
 			if c.Active {
-				if c.Private {
-					return NewShortChanIDFromInt(c.AliasScids[0])
-				} else {
-					return NewShortChanIDFromInt(c.ChanId)
-				}
+				return NewShortChanIDFromInt(c.ChanId)
 			}
 		} else {
 

diff --git a/itest/lsps2_happy_flow_test.go b/itest/lsps2_happy_flow_test.go
@@ -10,7 +10,7 @@ import (
 )
 
 func testLsps2HappyFlow(p *testParams) {
-	alice := lntest.NewClnNode(p.h, p.m, "Alice")
+	alice := lntest.NewLndNode(p.h, p.m, "Alice")
 	alice.Start()
 	alice.Fund(10000000)
 	p.lsp.LightningNode().Fund(10000000)

diff --git a/itest/lsps2_no_balance_test.go b/itest/lsps2_no_balance_test.go
@@ -10,7 +10,7 @@ import (
 )
 
 func testLsps2NoBalance(p *testParams) {
-	alice := lntest.NewClnNode(p.h, p.m, "Alice")
+	alice := lntest.NewLndNode(p.h, p.m, "Alice")
 	alice.Start()
 	alice.Fund(10000000)
 

diff --git a/itest/lsps2_zero_conf_utxo_test.go b/itest/lsps2_zero_conf_utxo_test.go
@@ -11,7 +11,7 @@ import (
 )
 
 func testLsps2ZeroConfUtxo(p *testParams) {
-	alice := lntest.NewClnNode(p.h, p.m, "Alice")
+	alice := lntest.NewLndNode(p.h, p.m, "Alice")
 	alice.Start()
 	alice.Fund(10000000)
 

diff --git a/itest/no_balance_test.go b/itest/no_balance_test.go
@@ -10,7 +10,7 @@ import (
 )
 
 func testNoBalance(p *testParams) {
-	alice := lntest.NewClnNode(p.h, p.m, "Alice")
+	alice := lntest.NewLndNode(p.h, p.m, "Alice")
 	alice.Start()
 	alice.Fund(10000000)
 

diff --git a/itest/notification_test.go b/itest/notification_test.go
@@ -14,7 +14,7 @@ import (
 )
 
 func testOfflineNotificationPaymentRegistered(p *testParams) {
-	alice := lntest.NewClnNode(p.h, p.m, "Alice")
+	alice := lntest.NewLndNode(p.h, p.m, "Alice")
 	alice.Start()
 	alice.Fund(10000000)
 	p.lsp.LightningNode().Fund(10000000)
@@ -91,7 +91,7 @@ func testOfflineNotificationPaymentRegistered(p *testParams) {
 }
 
 func testOfflineNotificationRegularForward(p *testParams) {
-	alice := lntest.NewClnNode(p.h, p.m, "Alice")
+	alice := lntest.NewLndNode(p.h, p.m, "Alice")
 	alice.Start()
 	alice.Fund(10000000)
 	p.lsp.LightningNode().Fund(10000000)
@@ -182,7 +182,7 @@ func testOfflineNotificationRegularForward(p *testParams) {
 }
 
 func testOfflineNotificationZeroConfChannel(p *testParams) {
-	alice := lntest.NewClnNode(p.h, p.m, "Alice")
+	alice := lntest.NewLndNode(p.h, p.m, "Alice")
 	alice.Start()
 	alice.Fund(10000000)
 	p.lsp.LightningNode().Fund(10000000)

diff --git a/itest/probing_test.go b/itest/probing_test.go
@@ -11,7 +11,7 @@ import (
 )
 
 func testProbing(p *testParams) {
-	alice := lntest.NewClnNode(p.h, p.m, "Alice")
+	alice := lntest.NewLndNode(p.h, p.m, "Alice")
 	alice.Start()
 	alice.Fund(10000000)
 	p.lsp.LightningNode().Fund(10000000)

diff --git a/itest/regular_forward_test.go b/itest/regular_forward_test.go
@@ -9,7 +9,7 @@ import (
 )
 
 func testRegularForward(p *testParams) {
-	alice := lntest.NewClnNode(p.h, p.m, "Alice")
+	alice := lntest.NewLndNode(p.h, p.m, "Alice")
 	alice.Start()
 	alice.Fund(10000000)
 	p.lsp.LightningNode().Fund(10000000)

diff --git a/itest/restart_lsp_node_test.go b/itest/restart_lsp_node_test.go
@@ -10,7 +10,7 @@ import (
 )
 
 func testRestartLspNode(p *testParams) {
-	alice := lntest.NewClnNode(p.h, p.m, "Alice")
+	alice := lntest.NewLndNode(p.h, p.m, "Alice")
 	alice.Start()
 	alice.Fund(10000000)
 	p.lsp.LightningNode().Fund(10000000)

diff --git a/itest/zero_conf_utxo_test.go b/itest/zero_conf_utxo_test.go
@@ -11,7 +11,7 @@ import (
 )
 
 func testOpenZeroConfUtxo(p *testParams) {
-	alice := lntest.NewClnNode(p.h, p.m, "Alice")
+	alice := lntest.NewLndNode(p.h, p.m, "Alice")
 	alice.Start()
 	alice.Fund(10000000)
 

diff --git a/itest/zero_reserve_test.go b/itest/zero_reserve_test.go
@@ -10,7 +10,7 @@ import (
 )
 
 func testZeroReserve(p *testParams) {
-	alice := lntest.NewClnNode(p.h, p.m, "Alice")
+	alice := lntest.NewLndNode(p.h, p.m, "Alice")
 	alice.Start()
 	alice.Fund(10000000)
 	p.lsp.LightningNode().Fund(10000000)