binaries/cuprated/src/rpc/json.rs

@@ -277,36 +277,33 @@ async fn get_block(
     mut state: CupratedRpcHandler,
     request: GetBlockRequest,
 ) -> Result<GetBlockResponse, Error> {
-    let (block, block_header) = if request.hash.is_empty() {
+    let block = if request.hash.is_empty() {
         helper::check_height(&mut state, request.height).await?;
-        let block = blockchain::block(&mut state.blockchain_read, request.height).await?;
-        let block_header =
-            helper::block_header(&mut state, request.height, request.fill_pow_hash).await?;
-        (block, block_header)
+        blockchain::block(&mut state.blockchain_read, request.height).await?
     } else {
         let hash = helper::hex_to_hash(request.hash)?;
-        let block = blockchain::block_by_hash(&mut state.blockchain_read, hash).await?;
-        let block_header =
-            helper::block_header_by_hash(&mut state, hash, request.fill_pow_hash).await?;
-        (block, block_header)
+        blockchain::block_by_hash(&mut state.blockchain_read, hash).await?
     };
 
-    let blob = hex::encode(block.serialize());
-    let miner_tx_hash = hex::encode(block.miner_transaction.hash());
-    let tx_hashes = block.transactions.iter().map(hex::encode).collect();
-    let json = {
-        let block = cuprate_types::json::block::Block::from(block);
-        serde_json::to_string_pretty(&block)?
-    };
+    Ok(todo!())
 
-    Ok(GetBlockResponse {
-        base: AccessResponseBase::ok(),
-        blob,
-        json,
-        miner_tx_hash,
-        tx_hashes,
-        block_header,
-    })
+    // let block_header = (&block).into();
+    // let blob = hex::encode(block.block_blob);
+    // let miner_tx_hash = hex::encode(block.block.miner_transaction.hash());
+    // let tx_hashes = block
+    //     .txs
+    //     .into_iter()
+    //     .map(|tx| hex::encode(tx.tx_hash))
+    //     .collect();
+
+    // Ok(GetBlockResponse {
+    //     base: AccessResponseBase::ok(),
+    //     blob,
+    //     json: todo!(), // TODO: make `JSON` type in `cuprate_rpc_types`
+    //     miner_tx_hash,
+    //     tx_hashes,
+    //     block_header,
+    // })
 }
 
 /// <https://github.com/monero-project/monero/blob/cc73fe71162d564ffda8e549b79a350bca53c454/src/rpc/core_rpc_server.cpp#L2729-L2738>

binaries/cuprated/src/rpc/request/address_book.rs

@@ -2,7 +2,7 @@
 
 use std::convert::Infallible;
 
-use anyhow::{anyhow, Error};
+use anyhow::Error;
 use tower::ServiceExt;
 
 use cuprate_helper::cast::usize_to_u64;
@@ -11,8 +11,6 @@ use cuprate_p2p_core::{
     AddressBook, NetworkZone,
 };
 
-// FIXME: use `anyhow::Error` over `tower::BoxError` in address book.
-
 /// [`AddressBookRequest::PeerlistSize`]
 pub(crate) async fn peerlist_size<Z: NetworkZone>(
     address_book: &mut impl AddressBook<Z>,
@@ -20,10 +18,10 @@ pub(crate) async fn peerlist_size<Z: NetworkZone>(
     let AddressBookResponse::PeerlistSize { white, grey } = address_book
         .ready()
         .await
-        .map_err(|e| anyhow!(e))?
+        .expect("TODO")
         .call(AddressBookRequest::PeerlistSize)
         .await
-        .map_err(|e| anyhow!(e))?
+        .expect("TODO")
     else {
         unreachable!();
     };
@@ -38,10 +36,10 @@ pub(crate) async fn connection_count<Z: NetworkZone>(
     let AddressBookResponse::ConnectionCount { incoming, outgoing } = address_book
         .ready()
         .await
-        .map_err(|e| anyhow!(e))?
+        .expect("TODO")
         .call(AddressBookRequest::ConnectionCount)
         .await
-        .map_err(|e| anyhow!(e))?
+        .expect("TODO")
     else {
         unreachable!();
     };
@@ -57,10 +55,10 @@ pub(crate) async fn set_ban<Z: NetworkZone>(
     let AddressBookResponse::Ok = address_book
         .ready()
         .await
-        .map_err(|e| anyhow!(e))?
+        .expect("TODO")
         .call(AddressBookRequest::SetBan(peer))
         .await
-        .map_err(|e| anyhow!(e))?
+        .expect("TODO")
     else {
         unreachable!();
     };
@@ -76,10 +74,10 @@ pub(crate) async fn get_ban<Z: NetworkZone>(
     let AddressBookResponse::GetBan { unban_instant } = address_book
         .ready()
         .await
-        .map_err(|e| anyhow!(e))?
+        .expect("TODO")
         .call(AddressBookRequest::GetBan(peer))
         .await
-        .map_err(|e| anyhow!(e))?
+        .expect("TODO")
     else {
         unreachable!();
     };
@@ -94,10 +92,10 @@ pub(crate) async fn get_bans<Z: NetworkZone>(
     let AddressBookResponse::GetBans(bans) = address_book
         .ready()
         .await
-        .map_err(|e| anyhow!(e))?
+        .expect("TODO")
         .call(AddressBookRequest::GetBans)
         .await
-        .map_err(|e| anyhow!(e))?
+        .expect("TODO")
     else {
         unreachable!();
     };

binaries/cuprated/src/rpc/request/blockchain_context.rs

@@ -2,7 +2,7 @@
 
 use std::convert::Infallible;
 
-use anyhow::{anyhow, Error};
+use anyhow::Error;
 use tower::{Service, ServiceExt};
 
 use cuprate_consensus::context::{
@@ -11,8 +11,6 @@ use cuprate_consensus::context::{
 };
 use cuprate_types::{FeeEstimate, HardFork, HardForkInfo};
 
-// FIXME: use `anyhow::Error` over `tower::BoxError` in blockchain context.
-
 /// [`BlockChainContextRequest::Context`].
 pub(crate) async fn context(
     service: &mut BlockChainContextService,
@@ -20,10 +18,10 @@ pub(crate) async fn context(
     let BlockChainContextResponse::Context(context) = service
         .ready()
         .await
-        .map_err(|e| anyhow!(e))?
+        .expect("TODO")
         .call(BlockChainContextRequest::Context)
         .await
-        .map_err(|e| anyhow!(e))?
+        .expect("TODO")
     else {
         unreachable!();
     };
@@ -39,10 +37,10 @@ pub(crate) async fn hard_fork_info(
     let BlockChainContextResponse::HardForkInfo(hf_info) = service
         .ready()
         .await
-        .map_err(|e| anyhow!(e))?
+        .expect("TODO")
         .call(BlockChainContextRequest::HardForkInfo(hard_fork))
         .await
-        .map_err(|e| anyhow!(e))?
+        .expect("TODO")
     else {
         unreachable!();
     };
@@ -58,10 +56,10 @@ pub(crate) async fn fee_estimate(
     let BlockChainContextResponse::FeeEstimate(fee) = service
         .ready()
         .await
-        .map_err(|e| anyhow!(e))?
+        .expect("TODO")
         .call(BlockChainContextRequest::FeeEstimate { grace_blocks })
         .await
-        .map_err(|e| anyhow!(e))?
+        .expect("TODO")
     else {
         unreachable!();
     };

binaries/cuprated/src/rpc/request/txpool.rs

@@ -2,7 +2,7 @@
 
 use std::convert::Infallible;
 
-use anyhow::{anyhow, Error};
+use anyhow::Error;
 use tower::{Service, ServiceExt};
 
 use cuprate_helper::cast::usize_to_u64;
@@ -14,17 +14,15 @@ use cuprate_txpool::{
     TxEntry,
 };
 
-// FIXME: use `anyhow::Error` over `tower::BoxError` in txpool.
-
 /// [`TxpoolReadRequest::Backlog`]
 pub(crate) async fn backlog(txpool_read: &mut TxpoolReadHandle) -> Result<Vec<TxEntry>, Error> {
     let TxpoolReadResponse::Backlog(tx_entries) = txpool_read
         .ready()
         .await
-        .map_err(|e| anyhow!(e))?
+        .expect("TODO")
         .call(TxpoolReadRequest::Backlog)
         .await
-        .map_err(|e| anyhow!(e))?
+        .expect("TODO")
     else {
         unreachable!();
     };
@@ -37,10 +35,10 @@ pub(crate) async fn size(txpool_read: &mut TxpoolReadHandle) -> Result<u64, Erro
     let TxpoolReadResponse::Size(size) = txpool_read
         .ready()
         .await
-        .map_err(|e| anyhow!(e))?
+        .expect("TODO")
         .call(TxpoolReadRequest::Size)
         .await
-        .map_err(|e| anyhow!(e))?
+        .expect("TODO")
     else {
         unreachable!();
     };