Commit Graph

1336 Commits

Author SHA1 Message Date
Jonas Nick
7928495e45
Merge #282: Improve tests
9977fa69af ci: use run-tests.sh (Erik Arvstedt)
a82f0f5f48 add test 'pkgsUnstable' (Erik Arvstedt)
95bc1237e2 run-tests: rename testDir -> scriptDir (Erik Arvstedt)
466d23deaa ci: extract build-to-cachix.sh (Erik Arvstedt)
a70c3bf210 make-test-vm: remove unneeded leftover arg attrs (Erik Arvstedt)
ed65e78a2b make-test: expose test config (Erik Arvstedt)
7265742655 run-tests: add 'instantiate' command (Erik Arvstedt)
8cbdef8bf6 run-tests: fix CLI (Erik Arvstedt)

Pull request description:

ACKs for top commit:
  jonasnick:
    Very nice! ACK 9977fa69af

Tree-SHA512: bb7f97096cc6e21f053c7db72a584a25ad62bca28af99e51fa83c15d2f75a198ada801428657821fc35f2cf01831176af8a9cd471e21dd0a7f5185f9d58efea1
2020-12-11 21:25:10 +00:00
Erik Arvstedt
9977fa69af
ci: use run-tests.sh 2020-12-11 13:27:06 +01:00
Erik Arvstedt
a82f0f5f48
add test 'pkgsUnstable'
Included in 'basic' tests.
Function 'doBuild' is needed by the following commit.
2020-12-11 13:27:05 +01:00
Erik Arvstedt
95bc1237e2
run-tests: rename testDir -> scriptDir 2020-12-11 13:27:05 +01:00
Erik Arvstedt
466d23deaa
ci: extract build-to-cachix.sh
Needed by the following commits.
Also, don't use the cachix cache as a substituter for local, non-CI
builds. This obviates the need for the 'untrusted' warning in build.sh.
2020-12-11 13:27:05 +01:00
Erik Arvstedt
a70c3bf210
make-test-vm: remove unneeded leftover arg attrs 2020-12-11 13:27:05 +01:00
Erik Arvstedt
ed65e78a2b
make-test: expose test config
This is useful for programmatically exploring a test config or for building a test system
on a custom platform.
2020-12-11 13:27:04 +01:00
Erik Arvstedt
7265742655
run-tests: add 'instantiate' command
Useful for diffing test derivations.
2020-12-11 13:27:04 +01:00
Erik Arvstedt
8cbdef8bf6
run-tests: fix CLI
Restore the original behavior that was accidentally changed:
When no args are given, run the basic test suite.
Otherwise, run the given command with default scenario 'default'.
Previously, `run-tests.sh build` ran the basic test suite instead of
building the default scenario.
2020-12-11 13:27:04 +01:00
Jonas Nick
d91c75d4ae
Merge #281: lightning-loop: 0.11.1-beta -> 0.11.2-beta
522b0000e6 lightning-loop: 0.11.1-beta -> 0.11.2-beta (nixbitcoin)

Pull request description:

ACKs for top commit:
  erikarvstedt:
    ACK 522b0000e6

Tree-SHA512: bbc46181cd6d2f25034e2205239aaf84f3972c5dfd56d98f116c7a2178f748e00b85b8676398329020c41e93ea18e67276ed6087c4d318aa7f6c3b88ce9ca20d
2020-12-10 20:24:26 +00:00
nixbitcoin
522b0000e6
lightning-loop: 0.11.1-beta -> 0.11.2-beta 2020-12-09 16:13:24 +00:00
Jonas Nick
b2a7158c4e
Merge #279: Update nixpkgs
fabe4df478 Update nixpkgs (Jonas Nick)
4318d0972d Remove lightning-charge and nanopos from the unstable_pkgs CI test (Jonas Nick)
8e268c5ced Fetch from the nixpkgs repo instead of nixpkgs-channels (Jonas Nick)

Pull request description:

ACKs for top commit:
  erikarvstedt:
    ACK fabe4df478

Tree-SHA512: b8445b9aff0fb57efb17cb162b6a07419063bfd6b3b2f71752d126a44d3a6dee6e8ccbc318c2b57d079e8915f525de7dffd7c0856fc78e864bb108bf4be9576f
2020-12-07 16:35:48 +00:00
Jonas Nick
7d370e9995
Merge #280: lnd: fix rpc/rest port configuration
5feb9e3eae lnd: fix rpc/rest port configuration (Martin Milata)

Pull request description:

ACKs for top commit:
  erikarvstedt:
    ACK 5feb9e3eae

Tree-SHA512: 7d743d4621e0a86dd636e77622a9369a630d6fe3375d0f89e22fc7175da94d5ab7eb17e61f3433061cb00ef5d5c9e7b51df6f7cd95578de9e33dd859c4547b46
2020-12-07 16:34:46 +00:00
Martin Milata
5feb9e3eae lnd: fix rpc/rest port configuration 2020-12-07 14:38:36 +01:00
Jonas Nick
fabe4df478
Update nixpkgs
Includes clightning: 0.9.1 -> 0.9.2 and btcpayserver: 1.0.5.5 -> 1.0.5.9
2020-12-07 12:30:11 +00:00
Jonas Nick
4318d0972d
Remove lightning-charge and nanopos from the unstable_pkgs CI test
They don't build with the nixpkgs-unstable update in the next commit and they're
deprecated anyway.
2020-12-07 12:29:59 +00:00
Jonas Nick
8e268c5ced
Fetch from the nixpkgs repo instead of nixpkgs-channels
nixpkgs-channels is deprecated.
2020-12-06 21:42:20 +00:00
Jonas Nick
ff7f5cc3bd
Merge #276: Use Cirrus CI
1c0233c0a8 use Cirrus CI (Erik Arvstedt)

Pull request description:

ACKs for top commit:
  jonasnick:
    ACK 1c0233c0a8

Tree-SHA512: 504c3a7808b6138e97ad35d1c3fa0f8666eeff1b09d35d914745cc51f45af183fc9baa08ff4702335e2a67e0bb09164902d9f7357beb12c009ed2e6f9629dbf6
2020-12-06 20:24:38 +00:00
Erik Arvstedt
1c0233c0a8
use Cirrus CI
- Make more economic use of the free CI resources by removing redundant build tasks:
  - Build unstable pkgs in a single separate task ("pkgs_unstable").
  - All stable pkgs are implicitly built by the modules tests.
- The build script (ci/build.sh) can now be executed locally for easier
  debugging.
- Use an explicit 'cachix push' command instead of helper/wait-for-network-idle.rb.
  This is simpler and more reliable.
2020-12-06 19:07:54 +01:00
Jonas Nick
0b12a4b5a1
Merge #275: electrs: 0.8.5 -> 0.8.6
a6346c2561 electrs: 0.8.5 -> 0.8.6 (Erik Arvstedt)

Pull request description:

ACKs for top commit:
  jonasnick:
    ACK a6346c2561

Tree-SHA512: 2440a30e5a158e78308e19af7aad8831a1b61a27581152867407ed92c2e6e353e27c9daef0ebf0f658f679f31739eb2428a94249f434cb653991c9d41aa1e15d
2020-12-01 20:43:27 +00:00
Erik Arvstedt
a6346c2561
electrs: 0.8.5 -> 0.8.6 2020-12-01 12:51:36 +01:00
Jonas Nick
e26d0577d9
Merge #270: Fix typo in gitignore
e01ef92379 Fix typo in gitignore (Daniela Brozzoni)

Pull request description:

ACKs for top commit:
  jonasnick:
    ACK e01ef92379

Tree-SHA512: 77a48a42fe9cc828f0e0f933318d58bc3f90afed24167a353adfd4532e39d2ceab4917bb86d8718199852b1f4e593c408fc1f76e311252668acf382b1195a5e1
2020-11-25 13:00:28 +00:00
Daniela Brozzoni
e01ef92379
Fix typo in gitignore
Instead of excluding `examples/secrets` `example/secret` was excluded
2020-11-24 18:25:12 +01:00
Jonas Nick
fdc338e4a3
Merge #259: Adds curated clightning plugins
1d44b99340 add curated clightning plugins (Ian Shipman)
4640821f96 make-test.nix: use writeText (Erik Arvstedt)
5399f73b20 add txzmq python pkg (Erik Arvstedt)
e62e163177 add clightning python pkgs (Erik Arvstedt)
1a16e55237 move python packages to pkgs/python-packages (Erik Arvstedt)

Pull request description:

ACKs for top commit:
  erikarvstedt:
    ACK 1d44b99340
  nixbitcoin:
    ACK 1d44b99340

Tree-SHA512: 566d1a606c27042de65d9291a2fbb2ee6866ae2befc43251e35b85cb035ed5aa26d7ef30bcf0364e045bd61d3460840ea5360466015d404febb5299a44c429f7
2020-11-22 20:06:22 +00:00
Ian Shipman
1d44b99340 add curated clightning plugins 2020-11-18 20:21:34 -06:00
Erik Arvstedt
4640821f96 make-test.nix: use writeText
Needed for the following commit which adds derivation outputs to `dataFile`.
2020-11-18 20:21:34 -06:00
Erik Arvstedt
5399f73b20 add txzmq python pkg 2020-11-18 20:21:34 -06:00
Erik Arvstedt
e62e163177 add clightning python pkgs 2020-11-18 20:21:34 -06:00
Erik Arvstedt
1a16e55237 move python packages to pkgs/python-packages
Remove obsolete passthru from joinmarket because joinmarket packages are
now accessible via pkgs/python-packages.
2020-11-18 20:21:34 -06:00
Jonas Nick
7e81071d0b
Merge #267: lightning-loop: 0.11.0-beta -> 0.11.1-beta
50372c9f2f lightning-loop: 0.11.0-beta -> 0.11.1-beta (nixbitcoin)

Pull request description:

ACKs for top commit:
  erikarvstedt:
    ACK 50372c9f2f

Tree-SHA512: 011e21cea2cc6c64b0a3a2ca1e0dd2704598bb8afa3531970d1571dffd94e451fa61a57059a6f41bb31039d16527c9da2c6fcaa5edcb99c21594bcf3882bea2b
2020-11-18 21:47:00 +00:00
nixbitcoin
50372c9f2f
lightning-loop: 0.11.0-beta -> 0.11.1-beta 2020-11-18 15:36:38 +00:00
Jonas Nick
ddd30cbb28
Merge #265: testing framework: re-add features removed in nixpkgs 20.09
7e3d2965a5 testing framework: re-add features removed in nixpkgs 20.09 (Erik Arvstedt)

Pull request description:

ACKs for top commit:
  jonasnick:
    ACK 7e3d2965a5

Tree-SHA512: d5527d56866f48022f8ccea3a85c41a5ea72288bc5dc87d920894af36619103d0a2734685d4ffd7c774aeb9ed4edcd7543fd223948f4cb12c022163dbec065a7
2020-11-14 22:13:05 +00:00
Erik Arvstedt
7e3d2965a5
testing framework: re-add features removed in nixpkgs 20.09
Since nixpks 20.09, the test output is just an empty directory.
Restore saving the log output and linking to the driver.

Without linking to the driver, the driver is eligible for
garbage collection after running a test via `run-tests.sh --out-link-prefix`,
which implies lengthy driver rebuilds.
2020-11-11 22:27:46 +01:00
Jonas Nick
3ba5888268
Merge #264: Fix containers for nixpkgs 20.09
f1681f5b45 add option nix-bitcoin.pkgs, remove overlay (Erik Arvstedt)
b1a5f5e7b9 don't add service-only pkgs to systemPackages (Erik Arvstedt)
e39ad358a4 lnd: remove unused bitcoind from PATH (Erik Arvstedt)

Pull request description:

ACKs for top commit:
  jonasnick:
    ACK f1681f5b45

Tree-SHA512: 1f55b015da3ab9696b6503b37bcf282e0c2776ea81117881e1b91d4807c4741c8fa9d0258d5e3fcd162b46836b245cf6f19ac8c0ca01481488de04df8eb39f96
2020-11-11 20:47:30 +00:00
Erik Arvstedt
f1681f5b45
add option nix-bitcoin.pkgs, remove overlay
This works around a nixpkgs bug where overlays are ignored in containers.
2020-11-09 22:10:07 +01:00
Erik Arvstedt
b1a5f5e7b9
don't add service-only pkgs to systemPackages
These packages are not useful in shell environemnts.
2020-11-09 22:10:07 +01:00
Erik Arvstedt
e39ad358a4
lnd: remove unused bitcoind from PATH 2020-11-09 22:10:07 +01:00
Jonas Nick
eda6dcfde3
Merge #263: Update nixpkgs (stable 20.03 -> 20.09)
a36957203c Update nixpkgs (stable 20.03 -> 20.09) (Jonas Nick)

Pull request description:

ACKs for top commit:
  erikarvstedt:
    ACK a36957203c

Tree-SHA512: 3d30b4d44745453d3984da888a63cf3544b948d79d73fec38a40ec39f81567b89c8fb58e356ebcc2a0349535ba1df56afaaa053b90ae13e3c8b6e62146bfcfd1
2020-11-09 07:12:43 +00:00
Jonas Nick
a36957203c
Update nixpkgs (stable 20.03 -> 20.09) 2020-11-08 20:37:16 +00:00
Jonas Nick
4e8b9f2989
Merge #258: joinmarket 0.7.0 -> 0.7.2 & lightning-loop 0.10.0-beta -> 0.11.0-beta
546053511b lightning-loop: 0.10.0-beta -> 0.11.0-beta (nixbitcoin)
f2faf708fb test: update joinmarket query strings (nixbitcoin)
59e128a994 joinmarket: add payjoin configuration (nixbitcoin)
f29f04c0c4 secure-node: LND no longer requires ControlPort (nixbitcoin)
d4c0653c64 joinmarket: 0.7.0 -> 0.7.2 (nixbitcoin)

Pull request description:

ACKs for top commit:
  erikarvstedt:
    ACK 546053511b

Tree-SHA512: b95742cba407725c95c240fb59b1a03dc27477c1d71e37b6e02847bb747e6cc7d51bb0960b299a1783ca5364706b0f2e6137aa4ab746a37c573196b0f22b551c
2020-11-06 12:17:18 +00:00
nixbitcoin
546053511b
lightning-loop: 0.10.0-beta -> 0.11.0-beta 2020-11-06 08:51:30 +00:00
nixbitcoin
f2faf708fb
test: update joinmarket query strings
JoinMarket changed message strings in
a2aafd254d and removed P2EPDaemonServerProtocolFactory in v0.7.1
2020-11-06 08:51:27 +00:00
nixbitcoin
59e128a994
joinmarket: add payjoin configuration 2020-11-06 08:51:25 +00:00
nixbitcoin
f29f04c0c4
secure-node: LND no longer requires ControlPort
Onion service is now generated through mkHiddenService function.
2020-11-06 08:51:23 +00:00
nixbitcoin
d4c0653c64
joinmarket: 0.7.0 -> 0.7.2 2020-11-06 08:51:15 +00:00
Jonas Nick
75bbd4d4a6
Merge #261: Fix netns restart
0972af55f1 netns: fix setup service restarts (Erik Arvstedt)
63a464431b netns: fail when netns already exists (Erik Arvstedt)

Pull request description:

ACKs for top commit:
  jonasnick:
    utACK 0972af55f1

Tree-SHA512: 0923d26c144eb19a11ec4c1f0cd512bb7a70b12c9b73c787f4af476c95c91ea012ff593d2b59e1ccea34193c6995ba60783049c5086ab286b323460905ca62e7
2020-11-04 13:29:53 +00:00
Erik Arvstedt
0972af55f1
netns: fix setup service restarts 2020-11-03 21:55:13 +01:00
Erik Arvstedt
63a464431b
netns: fail when netns already exists
Under normal circumstances, service-specific netns should never exist
before the netns setup service starts.
An existing netns is a genuine error that should not be silently ignored.
2020-11-03 21:55:13 +01:00
Jonas Nick
dbad828851
Merge #255: Improve netns-isolation and Tor config
b4b607dfa5 netns: simplify firewall setup (Erik Arvstedt)
25639cec42 netns: fix error msg when starting netns (Erik Arvstedt)
67068afd6b netns: fix error when stopping netns (Erik Arvstedt)
4ff88efc50 netns: add address binding test (Erik Arvstedt)
8da01fe8a6 lightning-loop: allow RPC access from main netns (Erik Arvstedt)
d76b080b74 lightning-loop: add RPC and REST server options (Erik Arvstedt)
9ddf7864a4 lightning-loop regtest: fix incorrectly succeeding test (Erik Arvstedt)
e66636ef0e liquidd: use type str for rpcbind (Erik Arvstedt)
de23fdd377 lnd: use type str for rpclisten, restlisten (Erik Arvstedt)
8b053326cc bitcoind: use type str for rpcbind (Erik Arvstedt)
6903e8afcc netns-liquidd: allow RPC access from main netns (Erik Arvstedt)
82f4901880 netns-lnd: allow RPC access from main netns (Erik Arvstedt)
58d24e735d netns-bitcoind: allow RPC access from main netns (Erik Arvstedt)
0e2ff948d3 test: add scenario 'netnsRegtest' (Erik Arvstedt)
e0675cb256 move enforceTor logic to service modules (Erik Arvstedt)
0cc8caa737 lnd: only set tor.active on enforceTor (Erik Arvstedt)
9a931483b9 netns test: remove strict dependency on clightning, electrs (Erik Arvstedt)
bae1b7f413 netns test: improve ping test (Erik Arvstedt)
5e0e16529c netns: fix default addressblock value type (Erik Arvstedt)

Pull request description:

ACKs for top commit:
  jonasnick:
    ACK b4b607dfa5
  nixbitcoin:
    ACK b4b607dfa5

Tree-SHA512: b290831d9a3fa4de56b0f19cf84a1998e830aa844532d7cba8cd8227c785a23bfa1514123a974652e8e61060e1297b6bfbcff9640580206a04c5292309b1daef
2020-11-02 16:11:34 +00:00
Erik Arvstedt
b4b607dfa5
netns: simplify firewall setup 2020-10-29 22:36:20 +01:00