add block propagation verification to FullTemplate mode test

Author: xyephy

integration-tests/tests/jd_full_template_mode.rs

@@ -1,18 +1,25 @@
 use integration_tests_sv2::{interceptor::MessageDirection, template_provider::DifficultyLevel, *};
-use stratum_apps::stratum_core::{common_messages_sv2::*, job_declaration_sv2::*};
+use stratum_apps::stratum_core::{
+    common_messages_sv2::*, job_declaration_sv2::*, template_distribution_sv2::*,
+};
 
 // JDC in FullTemplate mode (default) should exchange DeclareMiningJob with JDS
+// and block propagation should happen from both JDC (SubmitSolution to TP) and
+// JDC to JDS (PushSolution)
 #[tokio::test]
 async fn jd_full_template_mode_declare_mining_job_exchanged() {
     start_tracing();
     let (tp, tp_addr) = start_template_provider(None, DifficultyLevel::Low);
+    let current_block_hash = tp.get_best_block_hash().unwrap();
     let (_pool, pool_addr, _) = start_pool(sv2_tp_config(tp_addr), vec![], vec![], false).await;
     let (_jds, jds_addr) = start_jds(tp.rpc_info(), true);
     let (jdc_jds_sniffer, jdc_jds_sniffer_addr) =
         start_sniffer("jdc-jds", jds_addr, false, vec![], None);
+    let (jdc_tp_sniffer, jdc_tp_sniffer_addr) =
+        start_sniffer("jdc-tp", tp_addr, false, vec![], None);
     let (_jdc, jdc_addr, _) = start_jdc(
         &[(pool_addr, jdc_jds_sniffer_addr)],
-        sv2_tp_config(tp_addr),
+        sv2_tp_config(jdc_tp_sniffer_addr),
         vec![],
         vec![],
         false,
@@ -32,6 +39,7 @@ async fn jd_full_template_mode_declare_mining_job_exchanged() {
         start_sv2_translator(&[jdc_addr], false, vec![], vec![], None, false).await;
     let (_minerd_process, _minerd_addr) = start_minerd(tproxy_addr, None, None, false).await;
 
+    // DeclareMiningJob exchanged in both directions
     jdc_jds_sniffer
         .wait_for_message_type(
             MessageDirection::ToUpstream,
@@ -44,4 +52,17 @@ async fn jd_full_template_mode_declare_mining_job_exchanged() {
             MESSAGE_TYPE_DECLARE_MINING_JOB_SUCCESS,
         )
         .await;
+
+    // block propagation from JDC to TP
+    jdc_tp_sniffer
+        .wait_for_message_type(MessageDirection::ToUpstream, MESSAGE_TYPE_SUBMIT_SOLUTION)
+        .await;
+    let new_block_hash = tp.get_best_block_hash().unwrap();
+    assert_ne!(current_block_hash, new_block_hash);
+
+    // block propagation from JDC to JDS (PushSolution)
+    assert!(
+        jdc_jds_sniffer.has_message_type(MessageDirection::ToUpstream, MESSAGE_TYPE_PUSH_SOLUTION,),
+        "PushSolution should be sent to JDS in FullTemplate mode"
+    );
 }

integration-tests/tests/jd_mining_modes.rs

@@ -1,7 +1,6 @@
 use integration_tests_sv2::{interceptor::MessageDirection, template_provider::DifficultyLevel, *};
 use stratum_apps::stratum_core::{
-    common_messages_sv2::*, job_declaration_sv2::*, mining_sv2::*,
-    template_distribution_sv2::*,
+    common_messages_sv2::*, job_declaration_sv2::*, mining_sv2::*, template_distribution_sv2::*,
 };
 
 // JDS requires FullTemplate but JDC asks for CoinbaseOnly
@@ -108,8 +107,7 @@ async fn jd_coinbase_only_mode_no_declare_and_block_propagation_from_jdc_only()
 
     // check accumulated sniffer history: PushSolution should never have been sent
     assert!(
-        !jdc_jds_sniffer
-            .has_message_type(MessageDirection::ToUpstream, MESSAGE_TYPE_PUSH_SOLUTION),
+        !jdc_jds_sniffer.has_message_type(MessageDirection::ToUpstream, MESSAGE_TYPE_PUSH_SOLUTION),
         "PushSolution should NOT be sent to JDS in CoinbaseOnly mode"
     );