Skip to content

Commit 31629ee

Browse files
authored
Merge pull request ElementsProject#12 from jl777/jl777
rebased to latest clightning. still some issues but builds cleanly. privatebet unaffected
2 parents 766f293 + 686a21f commit 31629ee

File tree

697 files changed

+35962
-93018
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

697 files changed

+35962
-93018
lines changed

.dir-locals.el

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
((c-mode . ((c-file-style . "linux")
2+
(indent-tabs-mode . t)
3+
(show-trailing-whitespace . t)
4+
(c-basic-offset . 8)
5+
(tab-width . 8)
6+
))
7+
)

.gitattributes

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
# Declare files that will always have CRLF line endings on checkout.
2+
*.sh text eol=lf
3+
*.py text eol=lf
4+
Makefile text eol=lf

.github/ISSUE_TEMPLATE.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
### Issue and Steps to Reproduce
2+
<!-- Describe your issue and tell us how to reproduce it (include any useful information). -->
3+
4+
### `getinfo` output

.gitignore

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
*.pb
77
*.gcda
88
*.gcno
9+
*.dSYM
910
TAGS
1011
ccan/tools/configurator/configurator
1112
ccan/ccan/cdump/tools/cdump-enumstr
@@ -20,12 +21,25 @@ __pycache__
2021
lightningd/test/run-channel
2122
lightningd/test/run-cryptomsg
2223
lightningd/test/run-commit_tx
24+
lightningd/test/run-find_my_path
2325
lightningd/test/run-funding_tx
2426
lightningd/test/run-key_derive
27+
common/test/run-ip_port_parsing
2528
wire/test/run-peer-wire
2629
bitcoin/test/run-tx-encode
30+
channeld/test/run-full_channel
31+
common/test/run-bolt11
32+
common/test/run-json
33+
common/test/run-sphinx
2734
daemon/test/run-maxfee
35+
external/libbacktrace-build/
36+
external/libbacktrace.a
37+
external/libbacktrace.la
38+
gossipd/test/run-find_route-specific
39+
gossipd/test/run-initiator-success
40+
gossipd/test/run-responder-success
2841
test/test_protocol
2942
test/test_sphinx
3043
privatebet/bet
3144

45+
tests/.pytest.restart

.gitmodules

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,7 @@
1111
[submodule "external/libbacktrace"]
1212
path = external/libbacktrace
1313
url = https://github.com/ianlancetaylor/libbacktrace.git
14+
[submodule "external/libwally-core"]
15+
path = external/libwally-core
16+
url = https://github.com/ElementsProject/libwally-core.git
17+
ignore = dirty

.travis.yml

Lines changed: 26 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,33 @@ language: c
22
dist: trusty
33
sudo: true
44

5+
notifications:
6+
email: false
7+
58
env:
6-
- NO_VALGRIND=1 ARCH=32
7-
- NO_VALGRIND=1 ARCH=64
8-
- NO_VALGRIND=0 ARCH=64
9+
- ARCH=32 SOURCE_CHECK_ONLY=true
10+
- NO_VALGRIND=1 ARCH=32 DEVELOPER=1 COMPILER=gcc TEST_GROUP=1 TEST_GROUP_COUNT=2 SOURCE_CHECK_ONLY=false
11+
- NO_VALGRIND=1 ARCH=32 DEVELOPER=1 COMPILER=gcc TEST_GROUP=2 TEST_GROUP_COUNT=2 SOURCE_CHECK_ONLY=false
12+
- NO_VALGRIND=1 ARCH=64 DEVELOPER=1 COMPILER=gcc SOURCE_CHECK_ONLY=false
13+
- NO_VALGRIND=1 ARCH=64 DEVELOPER=0 COMPILER=gcc NO_COMPAT=1 SOURCE_CHECK_ONLY=false
14+
- NO_VALGRIND=0 ARCH=64 DEVELOPER=0 COMPILER=gcc TEST_GROUP=1 TEST_GROUP_COUNT=3 SOURCE_CHECK_ONLY=false
15+
- NO_VALGRIND=0 ARCH=64 DEVELOPER=0 COMPILER=gcc TEST_GROUP=2 TEST_GROUP_COUNT=3 SOURCE_CHECK_ONLY=false
16+
- NO_VALGRIND=0 ARCH=64 DEVELOPER=0 COMPILER=gcc TEST_GROUP=3 TEST_GROUP_COUNT=3 SOURCE_CHECK_ONLY=false
17+
- NO_VALGRIND=1 ARCH=64 DEVELOPER=1 COMPILER=clang SOURCE_CHECK_ONLY=false
18+
- NO_VALGRIND=0 ARCH=64 DEVELOPER=1 COMPILER=gcc TEST_GROUP=1 TEST_GROUP_COUNT=6 SOURCE_CHECK_ONLY=false
19+
- NO_VALGRIND=0 ARCH=64 DEVELOPER=1 COMPILER=gcc TEST_GROUP=2 TEST_GROUP_COUNT=6 SOURCE_CHECK_ONLY=false
20+
- NO_VALGRIND=0 ARCH=64 DEVELOPER=1 COMPILER=gcc TEST_GROUP=3 TEST_GROUP_COUNT=6 SOURCE_CHECK_ONLY=false
21+
- NO_VALGRIND=0 ARCH=64 DEVELOPER=1 COMPILER=gcc TEST_GROUP=4 TEST_GROUP_COUNT=6 SOURCE_CHECK_ONLY=false
22+
- NO_VALGRIND=0 ARCH=64 DEVELOPER=1 COMPILER=gcc TEST_GROUP=5 TEST_GROUP_COUNT=6 SOURCE_CHECK_ONLY=false
23+
- NO_VALGRIND=0 ARCH=64 DEVELOPER=1 COMPILER=gcc TEST_GROUP=6 TEST_GROUP_COUNT=6 SOURCE_CHECK_ONLY=false
924

1025
# Trusty (aka 14.04) is way way too old, so run in docker...
1126
script:
12-
- docker pull cdecker/lightning-ci:${ARCH}bit > /dev/null
13-
- docker run --rm=true -v "${TRAVIS_BUILD_DIR}":/build -t cdecker/lightning-ci:${ARCH}bit make -j3
14-
- docker run --rm=true -e NO_VALGRIND=${NO_VALGRIND:-0} -e TEST_DEBUG=${TEST_DEBUG:-0} -v "${TRAVIS_BUILD_DIR}":/build -t cdecker/lightning-ci:${ARCH}bit make check
15-
- docker run --rm=true -v "${TRAVIS_BUILD_DIR}":/build -t cdecker/lightning-ci:${ARCH}bit make check-source
27+
- docker pull cdecker/lightning-ci:${ARCH}bit | tee
28+
- env | grep -E '^[A-Z_]+\=' | tee /tmp/envlist
29+
- $SOURCE_CHECK_ONLY || docker run --rm=true --env-file=/tmp/envlist -v "${TRAVIS_BUILD_DIR}":/build -t cdecker/lightning-ci:${ARCH}bit make -j3 CC=${COMPILER} DEVELOPER=${DEVELOPER}
30+
- $SOURCE_CHECK_ONLY || docker run --rm=true --env-file=/tmp/envlist -v "${TRAVIS_BUILD_DIR}":/build -t cdecker/lightning-ci:${ARCH}bit make CC=${COMPILER} check DEVELOPER=${DEVELOPER}
31+
# - (! $SOURCE_CHECK_ONLY) || git clone https://github.com/lightningnetwork/lightning-rfc.git
32+
# - (! $SOURCE_CHECK_ONLY) || docker run --rm=true -v "${TRAVIS_BUILD_DIR}":/build -t cdecker/lightning-ci:${ARCH}bit make check-source BOLTDIR=lightning-rfc
33+
- (! $SOURCE_CHECK_ONLY) || docker run --rm=true -v "${TRAVIS_BUILD_DIR}":/build -t cdecker/lightning-ci:${ARCH}bit make clean
34+
- (! $SOURCE_CHECK_ONLY) || docker run --rm=true -v "${TRAVIS_BUILD_DIR}":/build -t cdecker/lightning-ci:${ARCH}bit make check-source BOLTDIR=none

0 commit comments

Comments
 (0)