increment the nonce while the difficulty is invalid instead of while …

…the difficulty threshold is invalid
ZcashFoundation · May 14, 2024 · 2703ec0 · 2703ec0
1 parent a7ed273
commit 2703ec0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git a/zebra-consensus/src/lib.rs b/zebra-consensus/src/lib.rs
@@ -46,7 +46,7 @@ pub mod router;
 pub mod transaction;
 
 #[cfg(any(test, feature = "proptest-impl"))]
-pub use block::check::difficulty_threshold_is_valid;
+pub use block::check::difficulty_is_valid;
 
 pub use block::{
     subsidy::{

diff --git a/zebrad/tests/common/regtest.rs b/zebrad/tests/common/regtest.rs
@@ -80,13 +80,9 @@ async fn submit_blocks(network: Network, rpc_address: SocketAddr) -> Result<()>
             .coinbase_height()
             .expect("should have a coinbase height");
 
-        while zebra_consensus::difficulty_threshold_is_valid(
-            &block.header,
-            &network,
-            &height,
-            &block.hash(),
-        )
-        .is_err()
+        while !network.disable_pow()
+            && zebra_consensus::difficulty_is_valid(&block.header, &network, &height, &block.hash())
+                .is_err()
         {
             increment_big_endian(Arc::make_mut(&mut block.header).nonce.as_mut());
         }