fix(test): Fixes bugs in the lightwalletd integration tests

zebrad/tests/common/lightwalletd/send_transaction_test.rs

@@ -21,11 +21,14 @@ use std::{cmp::min, sync::Arc, time::Duration};
 use color_eyre::eyre::Result;
 
 use zebra_chain::{
-    parameters::Network::{self, *},
+    block::Block,
+    parameters::Network::*,
     serialization::ZcashSerialize,
     transaction::{self, Transaction},
 };
+use zebra_node_services::rpc_client::RpcRequestClient;
 use zebra_rpc::queue::CHANNEL_AND_QUEUE_CAPACITY;
+use zebra_test::prelude::TestChild;
 use zebrad::components::mempool::downloads::MAX_INBOUND_CONCURRENCY;
 
 use crate::common::{
@@ -34,10 +37,14 @@ use crate::common::{
     lightwalletd::{
         can_spawn_lightwalletd_for_rpc, spawn_lightwalletd_for_rpc,
         sync::wait_for_zebrad_and_lightwalletd_sync,
-        wallet_grpc::{self, connect_to_lightwalletd, Empty, Exclude},
+        wallet_grpc::{
+            self, compact_tx_streamer_client::CompactTxStreamerClient, connect_to_lightwalletd,
+            Empty, Exclude,
+        },
     },
+    regtest::MiningRpcMethods,
     sync::LARGE_CHECKPOINT_TIMEOUT,
-    test_type::TestType::{self, *},
+    test_type::TestType::*,
 };
 
 /// The maximum number of transactions we want to send in the test.
@@ -85,11 +92,19 @@ pub async fn run() -> Result<()> {
         "running gRPC send transaction test using lightwalletd & zebrad",
     );
 
-    let transactions =
-        load_transactions_from_future_blocks(network.clone(), test_type, test_name).await?;
+    let mut count = 0;
+    let blocks: Vec<Block> =
+        get_future_blocks(&network, test_type, test_name, MAX_NUM_FUTURE_BLOCKS)
+            .await?
+            .into_iter()
+            .take_while(|block| {
+                count += block.transactions.len() - 1;
+                count <= max_sent_transactions()
+            })
+            .collect();
 
     tracing::info!(
-        transaction_count = ?transactions.len(),
+        blocks_count = ?blocks.len(),
         partial_sync_path = ?zebrad_state_path,
         "got transactions to send, spawning isolated zebrad...",
     );
@@ -113,6 +128,8 @@ pub async fn run() -> Result<()> {
 
     let zebra_rpc_address = zebra_rpc_address.expect("lightwalletd test must have RPC port");
 
+    let zebrad_rpc_client = RpcRequestClient::new(zebra_rpc_address);
+
     tracing::info!(
         ?test_type,
         ?zebra_rpc_address,
@@ -164,13 +181,38 @@ pub async fn run() -> Result<()> {
         .await?
         .into_inner();
 
+    for block in blocks {
+        zebrad = send_transactions_from_block(zebrad, &mut rpc_client, &zebrad_rpc_client, block)
+            .await?;
+    }
+
+    Ok(())
+}
+
+/// Sends non-coinbase transactions from a block to the mempool, verifies that the transactions
+/// can be found in the mempool via lightwalletd, and commits the block to Zebra's chainstate.
+///
+/// Returns the zebrad test child that's handling the RPC requests.
+#[tracing::instrument]
+async fn send_transactions_from_block(
+    mut zebrad: TestChild<tempfile::TempDir>,
+    rpc_client: &mut CompactTxStreamerClient<tonic::transport::Channel>,
+    zebrad_rpc_client: &RpcRequestClient,
+    block: Block,
+) -> Result<TestChild<tempfile::TempDir>> {
     // Lightwalletd won't call `get_raw_mempool` again until 2 seconds after the last call:
     // <https://github.com/zcash/lightwalletd/blob/master/frontend/service.go#L482>
     //
     // So we need to wait much longer than that here.
     let sleep_until_lwd_last_mempool_refresh =
         tokio::time::sleep(std::time::Duration::from_secs(4));
 
+    let transactions: Vec<_> = block
+        .transactions
+        .iter()
+        .filter(|tx| !tx.is_coinbase())
+        .collect();
+
     let transaction_hashes: Vec<transaction::Hash> =
         transactions.iter().map(|tx| tx.hash()).collect();
 
@@ -195,7 +237,7 @@ pub async fn run() -> Result<()> {
 
         tracing::info!(?transaction_hash, "sending transaction...");
 
-        let request = prepare_send_transaction_request(transaction);
+        let request = prepare_send_transaction_request(transaction.clone());
 
         let response = rpc_client.send_transaction(request).await?.into_inner();
 
@@ -206,6 +248,7 @@ pub async fn run() -> Result<()> {
     // Fails if there are only coinbase transactions in the first 50 future blocks
     tracing::info!("waiting for mempool to verify some transactions...");
     zebrad.expect_stdout_line_matches("sending mempool transaction broadcast")?;
+
     // Wait for more transactions to verify, `GetMempoolTx` only returns txs where tx.HasShieldedElements()
     // <https://github.com/zcash/lightwalletd/blob/master/frontend/service.go#L537>
     tokio::time::sleep(std::time::Duration::from_secs(2)).await;
@@ -233,7 +276,7 @@ pub async fn run() -> Result<()> {
 
     if tx_log.is_err() {
         tracing::info!("lightwalletd didn't query the mempool, skipping mempool contents checks");
-        return Ok(());
+        return Ok(zebrad);
     }
 
     tracing::info!("checking the mempool contains some of the sent transactions...");
@@ -257,7 +300,8 @@ pub async fn run() -> Result<()> {
     //       only check if a transaction from the first block has shielded elements
     assert!(
         !has_tx_with_shielded_elements || counter >= 1,
-        "failed to read v4+ transactions with shielded elements from future blocks in mempool via lightwalletd"
+        "failed to read v4+ transactions with shielded elements \
+        from future blocks in mempool via lightwalletd"
     );
 
     // TODO: GetMempoolStream: make sure at least one of the transactions were inserted into the mempool.
@@ -270,32 +314,9 @@ pub async fn run() -> Result<()> {
         _counter += 1;
     }
 
-    Ok(())
-}
-
-/// Loads transactions from a few block(s) after the chain tip of the cached state.
-///
-/// Returns a list of non-coinbase transactions from blocks that have not been finalized to disk
-/// in the `ZEBRA_CACHED_STATE_DIR`.
-///
-/// ## Panics
-///
-/// If the provided `test_type` doesn't need an rpc server and cached state
-#[tracing::instrument]
-async fn load_transactions_from_future_blocks(
-    network: Network,
-    test_type: TestType,
-    test_name: &str,
-) -> Result<Vec<Arc<Transaction>>> {
-    let transactions = get_future_blocks(&network, test_type, test_name, MAX_NUM_FUTURE_BLOCKS)
-        .await?
-        .into_iter()
-        .flat_map(|block| block.transactions)
-        .filter(|transaction| !transaction.is_coinbase())
-        .take(max_sent_transactions())
-        .collect();
+    zebrad_rpc_client.submit_block(block).await?;
 
-    Ok(transactions)
+    Ok(zebrad)
 }
 
 /// Prepare a request to send to lightwalletd that contains a transaction to be sent.