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

pay/sendpay: Use spec names for rhash and r.

Browse Source
This commit is contained in:
ZmnSCPxj
2018-03-02 12:54:37 +00:00
committed by Rusty Russell
parent dace9bfdcf
commit 8e8d7c2aba
4 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
contrib/pylightning/lightning/lightning.py
View File

@@ -254,13 +254,13 @@ class LightningRpc(UnixDomainSocketRpc):
""" """
return self.call("getinfo") return self.call("getinfo")
def sendpay(self, route, rhash): def sendpay(self, route, payment_hash):
""" """
Send along {route} in return for preimage of {rhash} Send along {route} in return for preimage of {payment_hash}
""" """
payload = { payload = {
"route": route, "route": route,
"rhash": rhash "payment_hash": payment_hash
} }
return self.call("sendpay", payload) return self.call("sendpay", payload)

6
lightningd/pay.c
View File

@@ -640,7 +640,7 @@ json_sendpay_success(struct command *cmd,
response = new_json_result(cmd); response = new_json_result(cmd);
json_object_start(response, NULL); json_object_start(response, NULL);
json_add_hex(response, "preimage", json_add_hex(response, "payment_preimage",
payment_preimage, sizeof(*payment_preimage)); payment_preimage, sizeof(*payment_preimage));
json_object_end(response); json_object_end(response);
command_success(cmd, response); command_success(cmd, response);
@@ -724,7 +724,7 @@ static void json_sendpay(struct command *cmd,
if (!json_get_params(cmd, buffer, params, if (!json_get_params(cmd, buffer, params,
"route", &routetok, "route", &routetok,
"rhash", &rhashtok, "payment_hash", &rhashtok,
NULL)) { NULL)) {
return; return;
} }
@@ -807,7 +807,7 @@ static void json_sendpay(struct command *cmd,
static const struct json_command sendpay_command = { static const struct json_command sendpay_command = {
"sendpay", "sendpay",
json_sendpay, json_sendpay,
"Send along {route} in return for preimage of {rhash}" "Send along {route} in return for preimage of {payment_hash}"
}; };
AUTODATA(json_command, &sendpay_command); AUTODATA(json_command, &sendpay_command);

2
lightningd/payalgo.c
View File

@@ -53,7 +53,7 @@ json_pay_success(struct command *cmd,
response = new_json_result(cmd); response = new_json_result(cmd);
json_object_start(response, NULL); json_object_start(response, NULL);
json_add_hex(response, "preimage", json_add_hex(response, "payment_preimage",
payment_preimage, sizeof(*payment_preimage)); payment_preimage, sizeof(*payment_preimage));
json_add_num(response, "getroute_tries", getroute_tries); json_add_num(response, "getroute_tries", getroute_tries);
json_add_num(response, "sendpay_tries", sendpay_tries); json_add_num(response, "sendpay_tries", sendpay_tries);

8
tests/test_lightningd.py
View File

@@ -838,14 +838,14 @@ class LightningDTests(BaseLightningDTests):
assert len(payments) == 1 assert len(payments) == 1
assert payments[0]['status'] == 'complete' assert payments[0]['status'] == 'complete'
assert payments[0]['payment_preimage'] == preimage2['preimage'] assert payments[0]['payment_preimage'] == preimage2['payment_preimage']
invoice3 = l2.rpc.listinvoices('testpayment3')['invoices'][0] invoice3 = l2.rpc.listinvoices('testpayment3')['invoices'][0]
payments = l1.rpc.listpayments(payment_hash=invoice3['payment_hash'])['payments'] payments = l1.rpc.listpayments(payment_hash=invoice3['payment_hash'])['payments']
assert len(payments) == 1 assert len(payments) == 1
assert payments[0]['status'] == 'complete' assert payments[0]['status'] == 'complete'
assert payments[0]['payment_preimage'] == preimage3['preimage'] assert payments[0]['payment_preimage'] == preimage3['payment_preimage']
def test_sendpay_cant_afford(self): def test_sendpay_cant_afford(self):
l1, l2 = self.connect() l1, l2 = self.connect()
@@ -938,7 +938,7 @@ class LightningDTests(BaseLightningDTests):
# Test listpayments indexed by bolt11. # Test listpayments indexed by bolt11.
assert len(l1.rpc.listpayments(inv)['payments']) == 1 assert len(l1.rpc.listpayments(inv)['payments']) == 1
assert l1.rpc.listpayments(inv)['payments'][0]['payment_preimage'] == preimage['preimage'] assert l1.rpc.listpayments(inv)['payments'][0]['payment_preimage'] == preimage['payment_preimage']
def test_pay_optional_args(self): def test_pay_optional_args(self):
l1, l2 = self.connect() l1, l2 = self.connect()
@@ -3110,7 +3110,7 @@ class LightningDTests(BaseLightningDTests):
self.wait_for_routes(l1, [chanid]) self.wait_for_routes(l1, [chanid])
# A duplicate should succeed immediately (nop) and return correct preimage. # A duplicate should succeed immediately (nop) and return correct preimage.
preimage = l1.rpc.pay(inv1['bolt11'])['preimage'] preimage = l1.rpc.pay(inv1['bolt11'])['payment_preimage']
assert l1.rpc.dev_rhash(preimage)['rhash'] == inv1['payment_hash'] assert l1.rpc.dev_rhash(preimage)['rhash'] == inv1['payment_hash']
@unittest.skipIf(not DEVELOPER, "needs DEVELOPER=1") @unittest.skipIf(not DEVELOPER, "needs DEVELOPER=1")