zecfoundation
/
zebra
mirror of https://github.com/ZcashFoundation/zebra.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Respond to inbound `TransactionsById` with mempool content (#2725) 

* reply to inbound `TransactionsById` requests

* apply style/redability suggestions and fix typo

Co-authored-by: Deirdre Connolly <durumcrustulum@gmail.com>

Co-authored-by: Deirdre Connolly <durumcrustulum@gmail.com>
Co-authored-by: Deirdre Connolly <deirdre@zfnd.org>
This commit is contained in:
Alfredo Garcia 2021-09-06 19:55:17 -03:00 committed by GitHub
parent 8e65e8281d
commit 65e308d2e1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 30 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
zebrad/src/components/inbound.rs
View File

@ -320,16 +320,14 @@ impl Service<zn::Request> for Inbound {
.map_ok(zn::Response::Blocks) .map_ok(zn::Response::Blocks)
.boxed() .boxed()
} }
zn::Request::TransactionsById(_transactions) => { zn::Request::TransactionsById(transactions) => {
// `zcashd` returns a list of found transactions, followed by a let request = mempool::Request::TransactionsById(transactions);
// `NotFound` message if any transactions are missing. `zcashd` self.mempool.clone().oneshot(request).map_ok(|resp| match resp {
// says that Simplified Payment Verification (SPV) clients rely on mempool::Response::Transactions(transactions) => zn::Response::Transactions(transactions),
// this behaviour - are there any of them on the Zcash network? _ => unreachable!("Mempool component should always respond to a `TransactionsById` request with a `Transactions` response"),
// https://github.com/zcash/zcash/blob/e7b425298f6d9a54810cb7183f00be547e4d9415/src/main.cpp#L5632 })
// We'll implement this request once we have a mempool: .boxed()
// https://en.bitcoin.it/wiki/Protocol_documentation#getdata
debug!("ignoring unimplemented request");
async { Ok(zn::Response::Nil) }.boxed()
} }
zn::Request::FindBlocks { known_blocks, stop } => { zn::Request::FindBlocks { known_blocks, stop } => {
let request = zs::Request::FindBlockHashes { known_blocks, stop }; let request = zs::Request::FindBlockHashes { known_blocks, stop };

30
zebrad/src/components/inbound/tests.rs
View File

@ -1,9 +1,9 @@
use tower::ServiceExt; use std::collections::HashSet;
use super::mempool::{unmined_transactions_in_blocks, Mempool}; use super::mempool::{unmined_transactions_in_blocks, Mempool};
use tokio::sync::oneshot; use tokio::sync::oneshot;
use tower::builder::ServiceBuilder; use tower::{builder::ServiceBuilder, ServiceExt};
use zebra_chain::{ use zebra_chain::{
parameters::Network, parameters::Network,
@ -14,7 +14,7 @@ use zebra_network::{Request, Response};
use zebra_state::Config as StateConfig; use zebra_state::Config as StateConfig;
#[tokio::test] #[tokio::test]
async fn mempool_requests_for_transaction_ids() { async fn mempool_requests_for_transactions() {
let network = Network::Mainnet; let network = Network::Mainnet;
let consensus_config = ConsensusConfig::default(); let consensus_config = ConsensusConfig::default();
let state_config = StateConfig::ephemeral(); let state_config = StateConfig::ephemeral();
@ -23,11 +23,8 @@ async fn mempool_requests_for_transaction_ids() {
let state_service = ServiceBuilder::new().buffer(1).service(state); let state_service = ServiceBuilder::new().buffer(1).service(state);
let mut mempool_service = Mempool::new(network); let mut mempool_service = Mempool::new(network);
let added_transaction_ids: Vec<UnminedTxId> = let added_transactions = add_some_stuff_to_mempool(&mut mempool_service, network);
add_some_stuff_to_mempool(&mut mempool_service, network) let added_transaction_ids: Vec<UnminedTxId> = added_transactions.iter().map(|t| t.id).collect();
.iter()
.map(|t| t.id)
.collect();
let (block_verifier, transaction_verifier) = let (block_verifier, transaction_verifier) =
zebra_consensus::chain::init(consensus_config.clone(), network, state_service.clone()) zebra_consensus::chain::init(consensus_config.clone(), network, state_service.clone())
@ -45,7 +42,9 @@ async fn mempool_requests_for_transaction_ids() {
mempool_service, mempool_service,
)); ));
// Test `Request::MempoolTransactionIds`
let request = inbound_service let request = inbound_service
.clone()
.oneshot(Request::MempoolTransactionIds) .oneshot(Request::MempoolTransactionIds)
.await; .await;
match request { match request {
@ -54,6 +53,21 @@ async fn mempool_requests_for_transaction_ids() {
"`MempoolTransactionIds` requests should always respond `Ok(Vec<UnminedTxId>)`" "`MempoolTransactionIds` requests should always respond `Ok(Vec<UnminedTxId>)`"
), ),
}; };
// Test `Request::TransactionsById`
let hash_set = added_transaction_ids
.iter()
.copied()
.collect::<HashSet<_>>();
let request = inbound_service
.oneshot(Request::TransactionsById(hash_set))
.await;
match request {
Ok(Response::Transactions(response)) => assert_eq!(response, added_transactions),
_ => unreachable!("`TransactionsById` requests should always respond `Ok(Vec<UnminedTx>)`"),
};
} }
fn add_some_stuff_to_mempool(mempool_service: &mut Mempool, network: Network) -> Vec<UnminedTx> { fn add_some_stuff_to_mempool(mempool_service: &mut Mempool, network: Network) -> Vec<UnminedTx> {