diff --git a/packages.nix b/packages.nix index bfc0f432..dfc7d894 100644 --- a/packages.nix +++ b/packages.nix @@ -17,27 +17,15 @@ bitcoind = (pkgs.bitcoind.overrideAttrs (attrs: { }; })); -# Build a clightning version with developer features enabled. -# Clightning is way more responsive with dev features. -clightning-dev = (pkgs.clightning.overrideDerivation (attrs: { - configureFlags = [ "--disable-valgrind" ]; - - pname = "clightning-dev"; - postInstall = '' - mv $out/bin/lightningd $out/bin/lightningd-dev - ''; -})); - in with pkgs; { execs = { clightning = clightning; - clightning-dev = clightning-dev; bitcoind = bitcoind; elementsd = elementsd; mermaid = nodePackages.mermaid-cli; lnd = lnd; }; - testpkgs = [ go bitcoind elementsd clightning-dev lnd ]; - devpkgs = [ go_1_19 gotools bitcoind elementsd clightning clightning-dev lnd ]; + testpkgs = [ go bitcoind elementsd lnd ]; + devpkgs = [ go_1_19 gotools bitcoind elementsd clightning lnd ]; } diff --git a/shell.nix b/shell.nix index aef74f6b..f00f1e6a 100644 --- a/shell.nix +++ b/shell.nix @@ -17,7 +17,6 @@ stdenv.mkDerivation rec { alias bitcoin-cli='${execs.bitcoind}/bin/bitcoin-cli' alias elementsd='${execs.elementsd}/bin/elementsd' alias elements-cli='${execs.elementsd}/bin/elements-cli' - alias lightningd-dev='${execs.clightning-dev}/bin/lightningd-dev' alias lnd='${execs.lnd}/bin/lnd' alias lncli='${execs.lnd}/bin/lncli' diff --git a/test/setup.go b/test/setup.go index 024a11fb..e9a6b787 100644 --- a/test/setup.go +++ b/test/setup.go @@ -81,8 +81,8 @@ func clnclnSetupWithConfig(t *testing.T, fundAmt, pushAmt uint64, clnConf []stri os.ModePerm, ) - // Use lightningd with dev flags enabled - lightningd.WithCmd("lightningd-dev") + // Use lightningd with --developer turned on + lightningd.WithCmd("lightningd") // Add plugin to cmd line options lightningd.AppendCmdLine(append([]string{fmt.Sprint("--plugin=", pathToPlugin)}, clnConf...)) @@ -243,8 +243,8 @@ func mixedSetup(t *testing.T, fundAmt uint64, funder fundingNode) (*testframewor os.ModePerm, ) - // Use lightningd with dev flags enabled - cln.WithCmd("lightningd-dev") + // Use lightningd with --developer turned on + cln.WithCmd("lightningd") // Add plugin to cmd line options cln.AppendCmdLine([]string{ @@ -405,8 +405,8 @@ func clnclnElementsSetup(t *testing.T, fundAmt uint64) (*testframework.BitcoinNo os.ModePerm, ) - // Use lightningd with dev flags enabled - lightningd.WithCmd("lightningd-dev") + // Use lightningd with --developer turned on + lightningd.WithCmd("lightningd") // Add plugin to cmd line options lightningd.AppendCmdLine([]string{ @@ -665,8 +665,8 @@ func mixedElementsSetup(t *testing.T, fundAmt uint64, funder fundingNode) (*test os.ModePerm, ) - // Use lightningd with dev flags enabled - cln.WithCmd("lightningd-dev") + // Use lightningd with --developer turned on + cln.WithCmd("lightningd") // Add plugin to cmd line options cln.AppendCmdLine([]string{ diff --git a/testframework/clightning.go b/testframework/clightning.go index 461a4f96..27ada206 100644 --- a/testframework/clightning.go +++ b/testframework/clightning.go @@ -83,6 +83,7 @@ func NewCLightningNode(testDir string, bitcoin *BitcoinNode, id int) (*CLightnin fmt.Sprintf("--bitcoin-rpcport=%s", bitcoinRpcPort), fmt.Sprintf("--bitcoin-datadir=%s", bitcoin.DataDir), fmt.Sprintf("--developer"), + fmt.Sprintf("--allow-deprecated-apis=true"), } // socketPath := filepath.Join(networkDir, "lightning-rpc")