status-im/nimbus-eth2
2
0
Fork 0
mirror of https://github.com/status-im/nimbus-eth2.git synced 2025-02-02 09:46:26 +00:00
Code Issues Projects Releases Wiki Activity

Fix /api/eth/v1/node/peers response.

Browse Source
This commit is contained in:
cheatfate 2021-04-04 10:23:36 +03:00 committed by zah
parent 55cbb82ab5
commit 23b2e663f1
3 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
beacon_chain/rpc/eth2_json_rest_serialization.nim
View File

@ -36,6 +36,16 @@ proc jsonResponse*(t: typedesc[RestApiResponse],
ok(ContentBody(contentType: "application/json",
data: stream.getOutput(seq[byte])))
proc jsonResponseWMeta*(t: typedesc[RestApiResponse],
data: auto, meta: auto): RestApiResponse =
var stream = memoryOutput()
var writer = JsonWriter[RestJson].init(stream)
writer.beginRecord()
writer.writeField("data", data)
writer.writeField("meta", meta)
writer.endRecord()
ok(ContentBody(contentType: "application/json",
data: stream.getOutput(seq[byte])))
proc jsonError*(t: typedesc[RestApiResponse], status: HttpCode = Http200,
msg: string = "", stacktrace: string = ""): RestApiResponse =

2
beacon_chain/rpc/node_rest_api.nim
View File

@ -198,7 +198,7 @@ proc installNodeApiHandlers*(router: var RestRouter, node: BeaconNode) =
proto: item.info.protoVersion # part of specification.
)
res.add(peer)
return RestApiResponse.jsonResponse(res)
return RestApiResponse.jsonResponseWMeta(res, (count: uint64(len(res))))
router.api(MethodGet, "/api/eth/v1/node/peer_count") do () -> RestApiResponse:
var res: RestNodePeerCountTuple

5
beacon_chain/rpc/rest_utils.nim
View File

@ -391,11 +391,6 @@ proc decodeString*(t: typedesc[string],
value: string): Result[string, cstring] =
ok(value)
proc jsonResponse*(t: typedesc[RestApiResponse], j: JsonNode): RestApiResponse =
let data = %*{"data": j}
ok(ContentBody(contentType: "application/json",
data: cast[seq[byte]]($data)))
proc getRouter*(): RestRouter =
RestRouter.init(validate)