lukechilds
/
lightning
mirror of https://github.com/lukechilds/lightning.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

feerates: rename sipa/bitcoind to perkw/perkb. 

Suggested-by: @cdecker
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
ppa-0.6.1
Rusty Russell 7 years ago
parent
a4b952ebc7
commit
af4fa9a359
2 changed files with 58 additions and 58 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      lightningd/chaintopology.c
  2. 110
      tests/test_misc.py

6
lightningd/chaintopology.c
View File

@ -446,10 +446,10 @@ static void json_feerates(struct command *cmd,
feerates[FEERATE_NORMAL] = normal ? *normal : 0;
feerates[FEERATE_SLOW] = slow ? *slow : 0;
if (json_tok_streq(buffer, style, "sipa")) {
if (json_tok_streq(buffer, style, "perkw")) {
bitcoind_style = false;
mulfactor = 1;
} else if (json_tok_streq(buffer, style, "bitcoind")) {
} else if (json_tok_streq(buffer, style, "perkb")) {
/* Everyone uses satoshi per kbyte, but we use satoshi per ksipa
* (don't round down to zero though)! */
for (size_t i = 0; i < ARRAY_SIZE(feerates); i++)
@ -478,7 +478,7 @@ static void json_feerates(struct command *cmd,
response = new_json_result(cmd);
json_object_start(response, NULL);
json_object_start(response, bitcoind_style ? "bitcoind" : "sipa");
json_object_start(response, bitcoind_style ? "perkb" : "perkw");
for (size_t i = 0; i < ARRAY_SIZE(feerates); i++) {
if (!feerates[i])
continue;

110
tests/test_misc.py
View File

@ -865,76 +865,76 @@ def test_feerates(node_factory):
l1.start()
# Query feerates (shouldn't give any!)
feerates = l1.rpc.feerates('sipa')
assert len(feerates['sipa']) == 2
feerates = l1.rpc.feerates('perkw')
assert len(feerates['perkw']) == 2
assert feerates['warning'] == 'Some fee estimates unavailable: bitcoind startup?'
assert 'bitcoind' not in feerates
assert feerates['sipa']['max_acceptable'] == 2**32 - 1
assert feerates['sipa']['min_acceptable'] == 253
assert 'perkb' not in feerates
assert feerates['perkw']['max_acceptable'] == 2**32 - 1
assert feerates['perkw']['min_acceptable'] == 253
feerates = l1.rpc.feerates('bitcoind')
assert len(feerates['bitcoind']) == 2
feerates = l1.rpc.feerates('perkb')
assert len(feerates['perkb']) == 2
assert feerates['warning'] == 'Some fee estimates unavailable: bitcoind startup?'
assert 'sipa' not in feerates
assert feerates['bitcoind']['max_acceptable'] == (2**32 - 1) * 4
assert feerates['bitcoind']['min_acceptable'] == 253 * 4
assert 'perkw' not in feerates
assert feerates['perkb']['max_acceptable'] == (2**32 - 1) * 4
assert feerates['perkb']['min_acceptable'] == 253 * 4
# Now try setting them, one at a time.
feerates = l1.rpc.feerates('sipa', 15000)
assert len(feerates['sipa']) == 3
assert feerates['sipa']['urgent'] == 15000
feerates = l1.rpc.feerates('perkw', 15000)
assert len(feerates['perkw']) == 3
assert feerates['perkw']['urgent'] == 15000
assert feerates['warning'] == 'Some fee estimates unavailable: bitcoind startup?'
assert 'bitcoind' not in feerates
assert feerates['sipa']['max_acceptable'] == 15000 * 10
assert feerates['sipa']['min_acceptable'] == 253
feerates = l1.rpc.feerates('bitcoind', normal=25000)
assert len(feerates['bitcoind']) == 4
assert feerates['bitcoind']['urgent'] == 15000 * 4
assert feerates['bitcoind']['normal'] == 25000
assert 'perkb' not in feerates
assert feerates['perkw']['max_acceptable'] == 15000 * 10
assert feerates['perkw']['min_acceptable'] == 253
feerates = l1.rpc.feerates('perkb', normal=25000)
assert len(feerates['perkb']) == 4
assert feerates['perkb']['urgent'] == 15000 * 4
assert feerates['perkb']['normal'] == 25000
assert feerates['warning'] == 'Some fee estimates unavailable: bitcoind startup?'
assert 'sipa' not in feerates
assert feerates['bitcoind']['max_acceptable'] == 15000 * 4 * 10
assert feerates['bitcoind']['min_acceptable'] == 253 * 4
feerates = l1.rpc.feerates('sipa', None, None, 5000)
assert len(feerates['sipa']) == 5
assert feerates['sipa']['urgent'] == 15000
assert feerates['sipa']['normal'] == 25000 // 4
assert feerates['sipa']['slow'] == 5000
assert 'perkw' not in feerates
assert feerates['perkb']['max_acceptable'] == 15000 * 4 * 10
assert feerates['perkb']['min_acceptable'] == 253 * 4
feerates = l1.rpc.feerates('perkw', None, None, 5000)
assert len(feerates['perkw']) == 5
assert feerates['perkw']['urgent'] == 15000
assert feerates['perkw']['normal'] == 25000 // 4
assert feerates['perkw']['slow'] == 5000
assert 'warning' not in feerates
assert 'bitcoind' not in feerates
assert feerates['sipa']['max_acceptable'] == 15000 * 10
assert feerates['sipa']['min_acceptable'] == 5000 // 2
assert 'perkb' not in feerates
assert feerates['perkw']['max_acceptable'] == 15000 * 10
assert feerates['perkw']['min_acceptable'] == 5000 // 2
# Now, outliers effect min and max, not so much the smoothed avg.
feerates = l1.rpc.feerates('sipa', 30000, None, 600)
assert len(feerates['sipa']) == 5
assert feerates['sipa']['urgent'] > 15000
assert feerates['sipa']['urgent'] < 30000
assert feerates['sipa']['normal'] == 25000 // 4
assert feerates['sipa']['slow'] < 5000
assert feerates['sipa']['slow'] > 600
feerates = l1.rpc.feerates('perkw', 30000, None, 600)
assert len(feerates['perkw']) == 5
assert feerates['perkw']['urgent'] > 15000
assert feerates['perkw']['urgent'] < 30000
assert feerates['perkw']['normal'] == 25000 // 4
assert feerates['perkw']['slow'] < 5000
assert feerates['perkw']['slow'] > 600
assert 'warning' not in feerates
assert 'bitcoind' not in feerates
assert feerates['sipa']['max_acceptable'] == 30000 * 10
assert feerates['sipa']['min_acceptable'] == 600 // 2
assert 'perkb' not in feerates
assert feerates['perkw']['max_acceptable'] == 30000 * 10
assert feerates['perkw']['min_acceptable'] == 600 // 2
# Forgotten after 3 more values inserted.
feerates = l1.rpc.feerates('sipa', 15000, 25000 // 4, 5000)
assert feerates['sipa']['max_acceptable'] == 30000 * 10
assert feerates['sipa']['min_acceptable'] == 600 // 2
feerates = l1.rpc.feerates('sipa', 15000, 25000 // 4, 5000)
assert feerates['sipa']['max_acceptable'] == 30000 * 10
assert feerates['sipa']['min_acceptable'] == 600 // 2
feerates = l1.rpc.feerates('sipa', 15000, 25000 // 4, 5000)
assert feerates['sipa']['max_acceptable'] == 15000 * 10
assert feerates['sipa']['min_acceptable'] == 5000 // 2
feerates = l1.rpc.feerates('perkw', 15000, 25000 // 4, 5000)
assert feerates['perkw']['max_acceptable'] == 30000 * 10
assert feerates['perkw']['min_acceptable'] == 600 // 2
feerates = l1.rpc.feerates('perkw', 15000, 25000 // 4, 5000)
assert feerates['perkw']['max_acceptable'] == 30000 * 10
assert feerates['perkw']['min_acceptable'] == 600 // 2
feerates = l1.rpc.feerates('perkw', 15000, 25000 // 4, 5000)
assert feerates['perkw']['max_acceptable'] == 15000 * 10
assert feerates['perkw']['min_acceptable'] == 5000 // 2
assert len(feerates['onchain_fee_estimates']) == 3
assert feerates['onchain_fee_estimates']['opening_channel_satoshis'] == feerates['sipa']['normal'] * 702 // 1000
assert feerates['onchain_fee_estimates']['mutual_close_satoshis'] == feerates['sipa']['normal'] * 673 // 1000
assert feerates['onchain_fee_estimates']['unilateral_close_satoshis'] == feerates['sipa']['urgent'] * 598 // 1000
assert feerates['onchain_fee_estimates']['opening_channel_satoshis'] == feerates['perkw']['normal'] * 702 // 1000
assert feerates['onchain_fee_estimates']['mutual_close_satoshis'] == feerates['perkw']['normal'] * 673 // 1000
assert feerates['onchain_fee_estimates']['unilateral_close_satoshis'] == feerates['perkw']['urgent'] * 598 // 1000
def test_logging(node_factory):

Write Preview
Loading…
Cancel
Save