From 887e9dcc44a23006e988c1e98f8b98e39a0998bf Mon Sep 17 00:00:00 2001 From: Rusty Russell Date: Thu, 21 Dec 2017 21:40:24 +1030 Subject: [PATCH] travis: reenable check-source (without BOLT text). We've been slipping, so fix up minor issues too so it compiles. Signed-off-by: Rusty Russell --- .travis.yml | 1 + common/bolt11.c | 2 +- common/bolt11.h | 2 +- common/withdraw_tx.c | 2 +- gossipd/routing.c | 2 +- gossipd/test/run-bench-find_route.c | 2 +- lightningd/peer_control.h | 2 +- wallet/wallet.c | 4 ++-- 8 files changed, 9 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index 39a4c47f1..50258b5f3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,3 +19,4 @@ script: - 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 CC=${COMPILER} check DEVELOPER=${DEVELOPER} # - git clone https://github.com/lightningnetwork/lightning-rfc.git # - docker run --rm=true -v "${TRAVIS_BUILD_DIR}":/build -t cdecker/lightning-ci:${ARCH}bit make check-source BOLTDIR=lightning-rfc + - docker run --rm=true -v "${TRAVIS_BUILD_DIR}":/build -t cdecker/lightning-ci:${ARCH}bit make check-source BOLTDIR=none diff --git a/common/bolt11.c b/common/bolt11.c index c2f57bd87..03498bffa 100644 --- a/common/bolt11.c +++ b/common/bolt11.c @@ -401,7 +401,7 @@ static void towire_route_info(u8 **pptr, const struct route_info *route_info) * * * `pubkey` (264 bits) * * `short_channel_id` (64 bits) - * * `fee_base_msat` (32 bits, big-endian) + * * `fee_base_msat` (32 bits, big-endian) * * `fee_proportional_millionths` (32 bits, big-endian) * * `cltv_expiry_delta` (16 bits, big-endian) */ diff --git a/common/bolt11.h b/common/bolt11.h index 42316958a..5336aadcc 100644 --- a/common/bolt11.h +++ b/common/bolt11.h @@ -22,7 +22,7 @@ struct bolt11_field { /* BOLT #11: * * `pubkey` (264 bits) * * `short_channel_id` (64 bits) - * * `fee_base_msat` (32 bits, big-endian) + * * `fee_base_msat` (32 bits, big-endian) * * `fee_proportional_millionths` (32 bits, big-endian) * * `cltv_expiry_delta` (16 bits, big-endian) */ diff --git a/common/withdraw_tx.c b/common/withdraw_tx.c index 2a1b4cbc2..7cb0ac433 100644 --- a/common/withdraw_tx.c +++ b/common/withdraw_tx.c @@ -5,8 +5,8 @@ #include #include #include -#include #include +#include struct bitcoin_tx *withdraw_tx(const tal_t *ctx, const struct utxo **utxos, diff --git a/gossipd/routing.c b/gossipd/routing.c index 5563ad31b..20c7ddd80 100644 --- a/gossipd/routing.c +++ b/gossipd/routing.c @@ -346,7 +346,7 @@ find_route(const tal_t *ctx, struct routing_state *rstate, msatoshi); return NULL; } - + /* Reset all the information. */ clear_bfg(rstate->nodes); diff --git a/gossipd/test/run-bench-find_route.c b/gossipd/test/run-bench-find_route.c index 4c450cc24..8dac1bfe6 100644 --- a/gossipd/test/run-bench-find_route.c +++ b/gossipd/test/run-bench-find_route.c @@ -21,7 +21,7 @@ static bool in_bench = 0; static char *fake_type_to_string_(const tal_t *ctx, const char *typename, union printable_types u) { - /* We *do* call this at end of route setup. */ + /* We *do* call this at end of route setup. */ if (streq(typename, "struct pubkey")) { size_t n; memcpy(&n, u.pubkey, sizeof(n)); diff --git a/lightningd/peer_control.h b/lightningd/peer_control.h index d90a8b7d7..9307a09d9 100644 --- a/lightningd/peer_control.h +++ b/lightningd/peer_control.h @@ -44,7 +44,7 @@ struct peer { /* Command which ordered us to open channel, if any. */ struct command *opening_cmd; - + /* Is there a single subdaemon responsible for us? */ struct subd *owner; diff --git a/wallet/wallet.c b/wallet/wallet.c index 7c44f3982..8525c5d02 100644 --- a/wallet/wallet.c +++ b/wallet/wallet.c @@ -171,7 +171,7 @@ static const struct utxo **wallet_select(const tal_t *ctx, struct wallet *w, w, &available[i]->txid, available[i]->outnum, output_state_available, output_state_reserved)) fatal("Unable to reserve output"); - + /* Input weight: txid + index + sequence */ input_weight = (32 + 4 + 4) * 4; @@ -217,7 +217,7 @@ const struct utxo **wallet_select_coins(const tal_t *ctx, struct wallet *w, *changesatoshi = satoshi_in - value - *fee_estimate; return utxo; } - + const struct utxo **wallet_select_all(const tal_t *ctx, struct wallet *w, const u32 feerate_per_kw, size_t outscriptlen,