From 0f77d612438aacd6847312420838b6702fe5980f Mon Sep 17 00:00:00 2001
From: bruwbird <bruwbird@mercari.com>
Date: Sun, 30 Jun 2024 16:16:57 +0900
Subject: [PATCH] ci debug

---
 Makefile                    |  2 +-
 flake.nix                   | 10 +++++-----
 test/utils.go               |  2 +-
 testframework/clightning.go |  1 +
 testframework/config.go     |  4 ++--
 5 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/Makefile b/Makefile
index 746cee4f..420a1988 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 OUTDIR=./out
 TEST_BIN_DIR=${OUTDIR}/test-builds
 PAYMENT_RETRY_TIME=10
-PEERSWAP_TEST_FILTER="peerswap"
+PEERSWAP_TEST_FILTER=""
 GIT_COMMIT=$(shell git rev-list -1 HEAD)
 
 BUILD_OPTS= \
diff --git a/flake.nix b/flake.nix
index a245d756..0a47acbd 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,11 +1,11 @@
 {
   inputs = {
-    # Pinning to revision 755b915a158c9d588f08e9b08da9f7f3422070cc 
-    # - cln v24.05
-    # - lnd v0.18.0-beta
-    # - bitcoin v27.1
+    # Pinning to revision f54322490f509985fa8be4ac9304f368bd8ab924 
+    # - cln v24.02.1
+    # - lnd v0.17.4-beta
+    # - bitcoin v26.0
     # - elements v23.2.1
-    nixpkgs.url = "github:NixOS/nixpkgs/755b915a158c9d588f08e9b08da9f7f3422070cc";
+    nixpkgs.url = "github:NixOS/nixpkgs/f54322490f509985fa8be4ac9304f368bd8ab924";
     flake-utils.url = "github:numtide/flake-utils";
     # blockstream-electrs: init at 0.4.1 #299761
     # https://github.com/NixOS/nixpkgs/pull/299761/commits/680d27ad847801af781e0a99e4b87ed73965c69a
diff --git a/test/utils.go b/test/utils.go
index 8708b1a5..97e22587 100644
--- a/test/utils.go
+++ b/test/utils.go
@@ -14,7 +14,7 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
-const defaultLines = 30
+const defaultLines = 1000
 
 func IsIntegrationTest(t *testing.T) {
 	if os.Getenv("RUN_INTEGRATION_TESTS") != "1" {
diff --git a/testframework/clightning.go b/testframework/clightning.go
index 05e60f72..ff12fa4e 100644
--- a/testframework/clightning.go
+++ b/testframework/clightning.go
@@ -85,6 +85,7 @@ func NewCLightningNode(testDir string, bitcoin *BitcoinNode, id int) (*CLightnin
 		fmt.Sprintf("--bitcoin-datadir=%s", bitcoin.DataDir),
 		fmt.Sprintf("--developer"),
 		fmt.Sprintf("--allow-deprecated-apis=true"),
+		fmt.Sprintln("--disable-plugin=offers"),
 	}
 
 	// socketPath := filepath.Join(networkDir, "lightning-rpc")
diff --git a/testframework/config.go b/testframework/config.go
index c534e857..152a2513 100644
--- a/testframework/config.go
+++ b/testframework/config.go
@@ -12,9 +12,9 @@ var TIMEOUT = setTimeout()
 
 func setTimeout() time.Duration {
 	if os.Getenv("SLOW_MACHINE") == "1" {
-		return 420 * time.Second
+		return 100 * time.Second
 	}
-	return 150 * time.Second
+	return 100 * time.Second
 }
 
 func WriteConfig(filename string, config map[string]string, regtestConfig map[string]string, sectionName string) {