map tower::BoxError to anyhow::Error

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

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

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

@@ -2,7 +2,7 @@
 
 use std::convert::Infallible;
 
-use anyhow::Error;
+use anyhow::{anyhow, Error};
 use tower::{Service, ServiceExt};
 
 use cuprate_consensus::context::{
@@ -11,6 +11,8 @@ 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,
@@ -18,10 +20,10 @@ pub(crate) async fn context(
     let BlockChainContextResponse::Context(context) = service
         .ready()
         .await
-        .expect("TODO")
+        .map_err(|e| anyhow!(e))?
         .call(BlockChainContextRequest::Context)
         .await
-        .expect("TODO")
+        .map_err(|e| anyhow!(e))?
     else {
         unreachable!();
     };
@@ -37,10 +39,10 @@ pub(crate) async fn hard_fork_info(
     let BlockChainContextResponse::HardForkInfo(hf_info) = service
         .ready()
         .await
-        .expect("TODO")
+        .map_err(|e| anyhow!(e))?
         .call(BlockChainContextRequest::HardForkInfo(hard_fork))
         .await
-        .expect("TODO")
+        .map_err(|e| anyhow!(e))?
     else {
         unreachable!();
     };
@@ -56,10 +58,10 @@ pub(crate) async fn fee_estimate(
     let BlockChainContextResponse::FeeEstimate(fee) = service
         .ready()
         .await
-        .expect("TODO")
+        .map_err(|e| anyhow!(e))?
         .call(BlockChainContextRequest::FeeEstimate { grace_blocks })
         .await
-        .expect("TODO")
+        .map_err(|e| anyhow!(e))?
     else {
         unreachable!();
     };

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

@@ -2,7 +2,7 @@
 
 use std::convert::Infallible;
 
-use anyhow::Error;
+use anyhow::{anyhow, Error};
 use tower::{Service, ServiceExt};
 
 use cuprate_helper::cast::usize_to_u64;
@@ -14,15 +14,17 @@ 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
-        .expect("TODO")
+        .map_err(|e| anyhow!(e))?
         .call(TxpoolReadRequest::Backlog)
         .await
-        .expect("TODO")
+        .map_err(|e| anyhow!(e))?
     else {
         unreachable!();
     };
@@ -35,10 +37,10 @@ pub(crate) async fn size(txpool_read: &mut TxpoolReadHandle) -> Result<u64, Erro
     let TxpoolReadResponse::Size(size) = txpool_read
         .ready()
         .await
-        .expect("TODO")
+        .map_err(|e| anyhow!(e))?
         .call(TxpoolReadRequest::Size)
         .await
-        .expect("TODO")
+        .map_err(|e| anyhow!(e))?
     else {
         unreachable!();
     };