Skip to content

Commit a505365

Browse files
committed
Fix location of error.data in the rpc response serialization.
1 parent 6abaf05 commit a505365

File tree

1 file changed

+14
-7
lines changed

1 file changed

+14
-7
lines changed

src/rpc/model.cpp

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -299,15 +299,22 @@ DEFINE_JSON_FROM_TAG(response_t)
299299
{
300300
const auto& result = instance.error.value();
301301

302-
object["error"] =
303-
{
304-
{ "code", result.code },
305-
{ "message", result.message }
306-
};
307-
308302
if (result.data.has_value())
309303
{
310-
object["data"] = value_from(result.data.value());
304+
object["error"] =
305+
{
306+
{ "code", result.code },
307+
{ "message", result.message },
308+
{ "data", value_from(result.data.value()) }
309+
};
310+
}
311+
else
312+
{
313+
object["error"] =
314+
{
315+
{ "code", result.code },
316+
{ "message", result.message }
317+
};
311318
}
312319
}
313320
else if (instance.jsonrpc == version::v1 ||

0 commit comments

Comments
 (0)