Merge pull request #429 from YusukeShimizu/chore/update-flake-lock-384

Update flake.lock

Author: YusukeShimizu

flake.lock

@@ -15,22 +15,10 @@
     };
     blockstream-electrs = {
       url = "github:Blockstream/electrs";
-      inputs = {
-        nixpkgs.follows = "nixpkgs";
-        flake-utils.follows = "flake-utils";
-        rust-overlay.follows = "rust-overlay";
-        crane.follows = "crane";
-      };
     };
 
     lwk-flake = {
       url = "github:blockstream/lwk/9ddd20a806625bb40cd063ad61d80d106809a9fd";
-      inputs = {
-        nixpkgs.follows = "nixpkgs";
-        flake-utils.follows = "flake-utils";
-        crane.follows = "crane";
-        rust-overlay.follows = "rust-overlay";
-      };
     };
   };
 

flake.nix

@@ -125,7 +125,14 @@ func TestPaymentWatcher_WatchPayment_Reconnect(t *testing.T) {
 	assert.False(t, gotCallback)
 
 	// We have to reconnect in order to pay the invoice.
-	payer.Connect(payee, true)
+	err = payer.Connect(payee, true)
+	if err != nil {
+		t.Fatalf("Failed Connect(): %v", err)
+	}
+	err = waitForLndPaymentRoute(payer, payee)
+	if err != nil {
+		t.Fatalf("Failed waiting for route: %v", err)
+	}
 
 	// Now we pay the invoice and check if the watcher is still active. If the
 	// watcher is still active, the callback should be called.
@@ -197,7 +204,14 @@ func TestPaymentWatcher_WatchPayment_Reconnect_OnGracefulStop(t *testing.T) {
 	assert.False(t, gotCallback)
 
 	// We have to reconnect in order to pay the invoice.
-	payer.Connect(payee, true)
+	err = payer.Connect(payee, true)
+	if err != nil {
+		t.Fatalf("Failed Connect(): %v", err)
+	}
+	err = waitForLndPaymentRoute(payer, payee)
+	if err != nil {
+		t.Fatalf("Failed waiting for route: %v", err)
+	}
 
 	// Now we pay the invoice and check if the watcher is still active. If the
 	// watcher is still active, the callback should be called.
@@ -213,6 +227,29 @@ func TestPaymentWatcher_WatchPayment_Reconnect_OnGracefulStop(t *testing.T) {
 	}
 }
 
+func waitForLndPaymentRoute(payer, payee *testframework.LndNode) error {
+	scid, err := payer.GetScid(payee)
+	if err != nil {
+		return fmt.Errorf("GetScid() %w", err)
+	}
+
+	return testframework.WaitForWithErr(func() (bool, error) {
+		payerActive, err := payer.IsChannelActive(scid)
+		if err != nil {
+			return false, fmt.Errorf("payer.IsChannelActive() %w", err)
+		}
+		payeeActive, err := payee.IsChannelActive(scid)
+		if err != nil {
+			return false, fmt.Errorf("payee.IsChannelActive() %w", err)
+		}
+		hasRoute, err := payer.HasRoute(payee.Id(), scid)
+		if err != nil {
+			return false, nil
+		}
+		return payerActive && payeeActive && hasRoute, nil
+	}, testframework.TIMEOUT)
+}
+
 func paymentwatcherNodeSetup(t *testing.T, dir string) (
 	bitcoind *testframework.BitcoinNode,
 	payer *testframework.LndNode,