Merge pull request #1427 from mintlayer/fix/get_block_json_return

Fix get_block_json return to return json value instead of a string

chainstate/src/rpc/mod.rs

@@ -53,7 +53,7 @@ trait ChainstateRpc {
 
     /// Returns a json-encoded serialized block with the given id.
     #[method(name = "get_block_json")]
-    async fn get_block_json(&self, id: Id<Block>) -> RpcResult<Option<String>>;
+    async fn get_block_json(&self, id: Id<Block>) -> RpcResult<Option<serde_json::Value>>;
 
     /// Returns a hex-encoded serialized blocks from the mainchain starting from a given block height.
     #[method(name = "get_mainchain_blocks")]
@@ -145,7 +145,7 @@ impl ChainstateRpcServer for super::ChainstateHandle {
         Ok(block.map(HexEncoded::new))
     }
 
-    async fn get_block_json(&self, id: Id<Block>) -> RpcResult<Option<String>> {
+    async fn get_block_json(&self, id: Id<Block>) -> RpcResult<Option<serde_json::Value>> {
         let both: Option<(Block, BlockIndex)> = rpc::handle_result(
             self.call(move |this| {
                 let block = this.get_block(id);
@@ -171,7 +171,11 @@ impl ChainstateRpcServer for super::ChainstateHandle {
 
         let result: Option<String> = result.map(|res| dehexify_all_addresses(&chain_config, &res));
 
-        Ok(result)
+        let result = result.map(|res| serde_json::from_str::<serde_json::Value>(&res));
+
+        let result = result.transpose();
+
+        rpc::handle_result(result)
     }
 
     async fn get_mainchain_blocks(

test/functional/wallet_submit_tx.py

@@ -121,7 +121,6 @@ async def async_test(self):
 
             block_id = node.chainstate_block_id_at_height(1)
             block = node.chainstate_get_block_json(block_id)
-            block = json.loads(block)
             timestamp = block['block']['V1']['header']['block_header']['timestamp']['timestamp']
 
             output = await wallet.get_transaction(tx_id)