Skip to content

Commit

Permalink
cln-rpc: Yet more RPC methods being mapped
Browse files Browse the repository at this point in the history
 - disconnect
 - feerates
 - getroute
 - listforwards
 - listpays
 - ping
 - signmessage
  • Loading branch information
cdecker committed Mar 29, 2022
1 parent 2d5a4d2 commit b9558ea
Show file tree
Hide file tree
Showing 9 changed files with 165 additions and 11 deletions.
18 changes: 7 additions & 11 deletions contrib/msggen/msggen/__main__.py
Original file line number Diff line number Diff line change
Expand Up @@ -81,22 +81,20 @@ def load_jsonrpc_service():
# "decode",
# "delpay",
# "disableoffer",
# "disconnect",
# "feerates",
"Disconnect",
"Feerates",
# "fetchinvoice",
# "fundchannel_cancel",
# "fundchannel_complete",
# "fundchannel",
# "fundchannel_start",
# "funderupdate",
# "fundpsbt",
# "getlog",
# "getroute",
"GetRoute",
# "getsharedsecret",
# "listconfigs",
# "listforwards",
"ListForwards",
# "listoffers",
# "listpays",
"ListPays",
# "multifundchannel",
# "multiwithdraw",
# "offerout",
Expand All @@ -107,16 +105,14 @@ def load_jsonrpc_service():
# "openchannel_signed",
# "openchannel_update",
# "parsefeerate",
# "ping",
"Ping",
# "plugin",
# "reserveinputs",
# "sendcustommsg",
# "sendinvoice",
# "sendonionmessage",
# "sendpsbt",
# "setchannelfee",
# "signmessage",
# "signpsbt",
"SignMessage",
# "unreserveinputs",
# "waitblockheight",
# "ListConfigs",
Expand Down
16 changes: 16 additions & 0 deletions doc/schemas/disconnect.request.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"$schema": "http://json-schema.org/draft-07/schema#",
"type": "object",
"additionalProperties": false,
"required": [
"id"
],
"properties": {
"id": {
"type": "pubkey"
},
"force": {
"type": "boolean"
}
}
}
17 changes: 17 additions & 0 deletions doc/schemas/feerates.request.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
{
"$schema": "http://json-schema.org/draft-07/schema#",
"type": "object",
"additionalProperties": false,
"required": [
"style"
],
"properties": {
"style": {
"type": "string",
"enum": [
"perkb",
"perkw"
]
}
}
}
46 changes: 46 additions & 0 deletions doc/schemas/getroute.request.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
{
"$schema": "http://json-schema.org/draft-07/schema#",
"type": "object",
"required": [
"id",
"msatoshi",
"riskfactor"
],
"properties": {
"id": {
"type": "pubkey",
"description": ""
},
"msatoshi": {
"type": "msat",
"description": ""
},
"riskfactor": {
"type": "u64",
"description": ""
},
"cltv": {
"type": "number",
"description": ""
},
"fromid": {
"type": "pubkey",
"description": ""
},
"fuzzpercent": {
"type": "u32",
"description": ""
},
"exclude": {
"type": "array",
"description": "",
"items": {
"type": "string"
}
},
"maxhops": {
"type": "u32",
"description": ""
}
}
}
22 changes: 22 additions & 0 deletions doc/schemas/listforwards.request.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{
"$schema": "http://json-schema.org/draft-07/schema#",
"type": "object",
"required": [],
"properties": {
"status": {
"type": "string",
"enum": [
"offered",
"settled",
"local_failed",
"failed"
]
},
"in_channel": {
"type": "short_channel_id"
},
"out_channel": {
"type": "short_channel_id"
}
}
}
22 changes: 22 additions & 0 deletions doc/schemas/listpays.request.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{
"$schema": "http://json-schema.org/draft-07/schema#",
"type": "object",
"required": [],
"additionalProperties": false,
"properties": {
"bolt11": {
"type": "string"
},
"payment_hash": {
"type": "hash"
},
"status": {
"type": "string",
"enum": [
"pending",
"complete",
"failed"
]
}
}
}
19 changes: 19 additions & 0 deletions doc/schemas/ping.request.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{
"$schema": "http://json-schema.org/draft-07/schema#",
"type": "object",
"required": [
"id"
],
"additionalProperties": false,
"properties": {
"id": {
"type": "pubkey"
},
"len": {
"type": "number"
},
"pongbytes": {
"type": "number"
}
}
}
13 changes: 13 additions & 0 deletions doc/schemas/signmessage.request.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"$schema": "http://json-schema.org/draft-07/schema#",
"type": "object",
"required": [
"id"
],
"additionalProperties": false,
"properties": {
"message": {
"type": "string"
}
}
}
3 changes: 3 additions & 0 deletions tests/test_cln_rs.py
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,9 @@ def test_grpc_connect(node_factory):
))
print(inv)

rates = stub.Feerates(nodepb.FeeratesRequest(style='PERKB'))
print(rates)

# Test a failing RPC call, so we know that errors are returned correctly.
with pytest.raises(Exception, match=r'Duplicate label'):
# This request creates a label collision
Expand Down

0 comments on commit b9558ea

Please sign in to comment.