aljaz/lightning
1
0
Fork 0
mirror of https://github.com/aljazceru/lightning.git synced 2025-12-19 15:14:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Adjust indents

Browse Source
This commit is contained in:
conanoc
2018-04-20 17:09:50 +09:00
committed by Christian Decker
parent 0a586acf6e
commit 0733770559
5 changed files with 57 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
gossipd/routing.c
View File

@@ -474,12 +474,12 @@ static u8 *check_channel_update(const tal_t *ctx,
} }
static u8 *check_channel_announcement(const tal_t *ctx, static u8 *check_channel_announcement(const tal_t *ctx,
const struct pubkey *node1_key, const struct pubkey *node2_key, const struct pubkey *node1_key, const struct pubkey *node2_key,
const struct pubkey *bitcoin1_key, const struct pubkey *bitcoin2_key, const struct pubkey *bitcoin1_key, const struct pubkey *bitcoin2_key,
const secp256k1_ecdsa_signature *node1_sig, const secp256k1_ecdsa_signature *node1_sig,
const secp256k1_ecdsa_signature *node2_sig, const secp256k1_ecdsa_signature *node2_sig,
const secp256k1_ecdsa_signature *bitcoin1_sig, const secp256k1_ecdsa_signature *bitcoin1_sig,
const secp256k1_ecdsa_signature *bitcoin2_sig, const u8 *announcement) const secp256k1_ecdsa_signature *bitcoin2_sig, const u8 *announcement)
{ {
/* 2 byte msg type + 256 byte signatures */ /* 2 byte msg type + 256 byte signatures */
int offset = 258; int offset = 258;
@@ -1086,39 +1086,39 @@ static struct wireaddr *read_addresses(const tal_t *ctx, const u8 *ser)
bool routing_add_node_announcement(struct routing_state *rstate, const u8 *msg TAKES) bool routing_add_node_announcement(struct routing_state *rstate, const u8 *msg TAKES)
{ {
struct node *node; struct node *node;
secp256k1_ecdsa_signature signature; secp256k1_ecdsa_signature signature;
u32 timestamp; u32 timestamp;
struct pubkey node_id; struct pubkey node_id;
u8 rgb_color[3]; u8 rgb_color[3];
u8 alias[32]; u8 alias[32];
u8 *features, *addresses; u8 *features, *addresses;
struct wireaddr *wireaddrs; struct wireaddr *wireaddrs;
fromwire_node_announcement(tmpctx, msg, fromwire_node_announcement(tmpctx, msg,
&signature, &features, &timestamp, &signature, &features, &timestamp,
&node_id, rgb_color, alias, &node_id, rgb_color, alias,
&addresses); &addresses);
node = get_node(rstate, &node_id); node = get_node(rstate, &node_id);
/* May happen if we accepted the node_announcement due to a local /* May happen if we accepted the node_announcement due to a local
* channel, for which we didn't have the announcement hust yet. */ * channel, for which we didn't have the announcement hust yet. */
if (node == NULL) if (node == NULL)
return false; return false;
wireaddrs = read_addresses(tmpctx, addresses); wireaddrs = read_addresses(tmpctx, addresses);
tal_free(node->addresses); tal_free(node->addresses);
node->addresses = tal_steal(node, wireaddrs); node->addresses = tal_steal(node, wireaddrs);
node->last_timestamp = timestamp; node->last_timestamp = timestamp;
memcpy(node->rgb_color, rgb_color, 3); memcpy(node->rgb_color, rgb_color, 3);
tal_free(node->alias); tal_free(node->alias);
node->alias = tal_dup_arr(node, u8, alias, 32, 0); node->alias = tal_dup_arr(node, u8, alias, 32, 0);
replace_broadcast(node, rstate->broadcasts, replace_broadcast(node, rstate->broadcasts,
&node->node_announce_msgidx, &node->node_announce_msgidx,
msg); msg);
return true; return true;
} }
static bool node_has_public_channels(struct node *node) static bool node_has_public_channels(struct node *node)

3
hsmd/hsm.c
View File

@@ -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
View File

@@ -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);

5
lightningd/opening_control.c
View File

@@ -839,7 +839,7 @@ static void json_fund_channel(struct command *cmd,
bool all_funds = false; bool all_funds = false;
struct funding_channel * fc; struct funding_channel * fc;
u32 feerate_per_kw = get_feerate(cmd->ld->topology, FEERATE_NORMAL); u32 feerate_per_kw = get_feerate(cmd->ld->topology, FEERATE_NORMAL);
u64 fee_estimate; u64 fee_estimate;
u8 *msg; u8 *msg;
if (!json_get_params(cmd, buffer, params, if (!json_get_params(cmd, buffer, params,
@@ -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;
@@ -873,7 +872,7 @@ static void json_fund_channel(struct command *cmd,
/* Try to do this now, so we know if insufficient funds. */ /* Try to do this now, so we know if insufficient funds. */
/* FIXME: dustlimit */ /* FIXME: dustlimit */
if (all_funds) { if (all_funds) {
fc->utxomap = wallet_select_all(cmd, cmd->ld->wallet, fc->utxomap = wallet_select_all(cmd, cmd->ld->wallet,
feerate_per_kw, feerate_per_kw,
BITCOIN_SCRIPTPUBKEY_P2WSH_LEN, BITCOIN_SCRIPTPUBKEY_P2WSH_LEN,

25
wallet/walletrpc.c
View File

@@ -83,7 +83,7 @@ static void wallet_withdrawal_broadcast(struct bitcoind *bitcoind UNUSED,
* the HSM to generate the signatures. * the HSM to generate the signatures.
*/ */
static void json_withdraw(struct command *cmd, static void json_withdraw(struct command *cmd,
const char *buffer, const jsmntok_t *params) const char *buffer, const jsmntok_t *params)
{ {
jsmntok_t *desttok, *sattok; jsmntok_t *desttok, *sattok;
struct withdrawal *withdraw; struct withdrawal *withdraw;
@@ -281,7 +281,7 @@ static const struct json_command newaddr_command = {
AUTODATA(json_command, &newaddr_command); AUTODATA(json_command, &newaddr_command);
static void json_listaddrs(struct command *cmd, static void json_listaddrs(struct command *cmd,
const char *buffer, const jsmntok_t *params) const char *buffer, const jsmntok_t *params)
{ {
struct json_result *response = new_json_result(cmd); struct json_result *response = new_json_result(cmd);
struct ext_key ext; struct ext_key ext;
@@ -326,7 +326,7 @@ static void json_listaddrs(struct command *cmd,
sha256(&h, redeemscript, tal_count(redeemscript)); sha256(&h, redeemscript, tal_count(redeemscript));
ripemd160(&h160, h.u.u8, sizeof(h)); ripemd160(&h160, h.u.u8, sizeof(h));
char *out_p2sh = p2sh_to_base58(cmd, char *out_p2sh = p2sh_to_base58(cmd,
get_chainparams(cmd->ld)->testnet, &h160); get_chainparams(cmd->ld)->testnet, &h160);
// bech32 : p2wpkh // bech32 : p2wpkh
const char *hrp = get_chainparams(cmd->ld)->bip173_name; const char *hrp = get_chainparams(cmd->ld)->bip173_name;
@@ -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);
@@ -386,8 +387,9 @@ static void json_listfunds(struct command *cmd, const char *buffer UNUSED,
utxos[i]->keyindex); utxos[i]->keyindex);
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,
"For each output stored in the internal wallet ask `bitcoind` whether we are in sync with its state (spent vs. unspent)" "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)"
}; };
AUTODATA(json_command, &dev_rescan_output_command); AUTODATA(json_command, &dev_rescan_output_command);