Remove excessive wrapping in the rpc_command hook call
#3560
Conversation
cdecker
changed the title
rpc_command hook call
| @@ -611,8 +611,21 @@ struct rpc_command_hook_payload { | |||
| static void rpc_command_hook_serialize(struct rpc_command_hook_payload *p, | |||
There was a problem hiding this comment.
I think this commit needs a Changelog-Deprecated line ?
|
|
||
| #ifdef COMPAT_V081 | ||
| if (deprecated_apis) | ||
| json_add_tok(s, "rpc_command", p->request, p->buffer); |
There was a problem hiding this comment.
heh i came across this yesterday. can you remove the outer object and instead do this line? it should achieve the same result without needing to iterate through the object.
There was a problem hiding this comment.
I tried to do that, however if I use json_add_tok to fill in {"rpc_command": <copy>} I cannot re-enter the rpc_command key to then add the compat version, i.e., {"rpc_command": {"rpc_command": <copy>, <copied-fields}}. Once we remove the COMPAT_V081 flag we can actually do this and avoid iterating through, but until then I'm afraid we need to keep this.
There was a problem hiding this comment.
ack. i understand what this outputs now. thanks.
cdecker
force-pushed
the
issue-3558
branch
2 times, most recently
from
e0b9ecd
to
81ad2a5
Compare
We were nesting like the following:
```json
{"params": {
"rpc_command": {
"rpc_command": {
}
}
}
```
This is really excessive, so we unwrap once, and now have the following:
```json
{"params": {
"rpc_command": {
}
}
```
Still more wrapping than necessary (the method is repeated in the `params`
object), but it's getting closer.
Changelog-Deprecated: JSON-RPC: Removed double wrapping of `rpc_command` payload in `rpc_command` JSON field.
Suggested-by: @fiatjaf
Signed-off-by: Christian Decker <@cdecker>
|
Rebased and squashed :-) |
We were nesting like the following:
{"params": { "rpc_command": { "rpc_command": { } } }This is really excessive, so we unwrap once, and now have the following:
{"params": { "rpc_command": { } }Still more wrapping than necessary (the method is repeated in the
paramsobject), but it's getting closer.
Suggested-by: @fiatjaf
Signed-off-by: Christian Decker <@cdecker>
Fixes #3558