Browse Source

Adjust indents

ppa-0.6.1
conanoc 7 years ago
committed by Christian Decker
parent
commit
0733770559
  1. 3
      hsmd/hsm.c
  2. 10
      lightningd/gossip_msg.c
  3. 1
      lightningd/opening_control.c
  4. 15
      wallet/walletrpc.c

3
hsmd/hsm.c

@ -252,8 +252,7 @@ static bool check_client_capabilities(struct client *client,
case WIRE_HSM_SIGN_INVOICE: case WIRE_HSM_SIGN_INVOICE:
return (client->capabilities & HSM_CAP_MASTER) != 0; return (client->capabilities & HSM_CAP_MASTER) != 0;
/* These are messages sent by the HSM so we should never receive /* These are messages sent by the HSM so we should never receive them */
* them */
case WIRE_HSM_ECDH_RESP: case WIRE_HSM_ECDH_RESP:
case WIRE_HSM_CANNOUNCEMENT_SIG_REPLY: case WIRE_HSM_CANNOUNCEMENT_SIG_REPLY:
case WIRE_HSM_CUPDATE_SIG_REPLY: case WIRE_HSM_CUPDATE_SIG_REPLY:

10
lightningd/gossip_msg.c

@ -2,7 +2,8 @@
#include <lightningd/gossip_msg.h> #include <lightningd/gossip_msg.h>
#include <wire/wire.h> #include <wire/wire.h>
struct gossip_getnodes_entry *fromwire_gossip_getnodes_entry(const tal_t *ctx, const u8 **pptr, size_t *max) struct gossip_getnodes_entry *fromwire_gossip_getnodes_entry(const tal_t *ctx,
const u8 **pptr, size_t *max)
{ {
u8 numaddresses, i; u8 numaddresses, i;
struct gossip_getnodes_entry *entry; struct gossip_getnodes_entry *entry;
@ -32,7 +33,8 @@ struct gossip_getnodes_entry *fromwire_gossip_getnodes_entry(const tal_t *ctx, c
return entry; return entry;
} }
void towire_gossip_getnodes_entry(u8 **pptr, const struct gossip_getnodes_entry *entry) void towire_gossip_getnodes_entry(u8 **pptr,
const struct gossip_getnodes_entry *entry)
{ {
u8 i, numaddresses = tal_count(entry->addresses); u8 i, numaddresses = tal_count(entry->addresses);
towire_pubkey(pptr, &entry->nodeid); towire_pubkey(pptr, &entry->nodeid);
@ -83,8 +85,8 @@ void fromwire_gossip_getchannels_entry(const u8 **pptr, size_t *max,
} }
} }
void towire_gossip_getchannels_entry( void towire_gossip_getchannels_entry(u8 **pptr,
u8 **pptr, const struct gossip_getchannels_entry *entry) const struct gossip_getchannels_entry *entry)
{ {
towire_short_channel_id(pptr, &entry->short_channel_id); towire_short_channel_id(pptr, &entry->short_channel_id);
towire_pubkey(pptr, &entry->source); towire_pubkey(pptr, &entry->source);

1
lightningd/opening_control.c

@ -856,7 +856,6 @@ static void json_fund_channel(struct command *cmd,
if (json_tok_streq(buffer, sattok, "all")) { if (json_tok_streq(buffer, sattok, "all")) {
all_funds = true; all_funds = true;
} else if (!json_tok_u64(buffer, sattok, &fc->funding_satoshi)) { } else if (!json_tok_u64(buffer, sattok, &fc->funding_satoshi)) {
command_fail(cmd, "Invalid satoshis"); command_fail(cmd, "Invalid satoshis");
return; return;

15
wallet/walletrpc.c

@ -357,7 +357,8 @@ static void json_listaddrs(struct command *cmd,
static const struct json_command listaddrs_command = { static const struct json_command listaddrs_command = {
"dev-listaddrs", "dev-listaddrs",
json_listaddrs, json_listaddrs,
"Show addresses list up to derivation {index} (default is the last bip32 index)", false, "Show addresses list up to derivation {index} (default is the last bip32 index)",
false,
"Show addresses of your internal wallet. Use `newaddr` to generate a new address." "Show addresses of your internal wallet. Use `newaddr` to generate a new address."
}; };
AUTODATA(json_command, &listaddrs_command); AUTODATA(json_command, &listaddrs_command);
@ -387,7 +388,8 @@ static void json_listfunds(struct command *cmd, const char *buffer UNUSED,
pubkey_to_hash160(&funding_pubkey, &h160); pubkey_to_hash160(&funding_pubkey, &h160);
if (utxos[i]->is_p2sh) { if (utxos[i]->is_p2sh) {
out = p2sh_to_base58(cmd, out = p2sh_to_base58(cmd,
get_chainparams(cmd->ld)->testnet, &h160); get_chainparams(cmd->ld)->testnet,
&h160);
} else { } else {
const char *hrp = get_chainparams(cmd->ld)->bip173_name; const char *hrp = get_chainparams(cmd->ld)->bip173_name;
/* out buffer is 73 + strlen(human readable part). see bech32.h */ /* out buffer is 73 + strlen(human readable part). see bech32.h */
@ -442,7 +444,8 @@ static void json_listfunds(struct command *cmd, const char *buffer UNUSED,
static const struct json_command listfunds_command = { static const struct json_command listfunds_command = {
"listfunds", "listfunds",
json_listfunds, json_listfunds,
"Show available funds from the internal wallet", false, "Show available funds from the internal wallet",
false,
"Returns a list of funds (outputs) that can be used by the internal wallet to open new channels or can be withdrawn, using the `withdraw` command, to another wallet." "Returns a list of funds (outputs) that can be used by the internal wallet to open new channels or can be withdrawn, using the `withdraw` command, to another wallet."
}; };
AUTODATA(json_command, &listfunds_command); AUTODATA(json_command, &listfunds_command);
@ -513,8 +516,10 @@ static void json_dev_rescan_outputs(struct command *cmd,
} }
static const struct json_command dev_rescan_output_command = { static const struct json_command dev_rescan_output_command = {
"dev-rescan-outputs", json_dev_rescan_outputs, "dev-rescan-outputs",
"Synchronize the state of our funds with bitcoind", false, json_dev_rescan_outputs,
"Synchronize the state of our funds with bitcoind",
false,
"For each output stored in the internal wallet ask `bitcoind` whether we are in sync with its state (spent vs. unspent)" "For each output stored in the internal wallet ask `bitcoind` whether we are in sync with its state (spent vs. unspent)"
}; };
AUTODATA(json_command, &dev_rescan_output_command); AUTODATA(json_command, &dev_rescan_output_command);

Loading…
Cancel
Save