Fix folders for ZKP keys

Remove zkp_propagation from config and rename log for push_macro Co-authored-by: ii-cruz <[email protected]>
nimiq · Apr 24, 2023 · 06bc624 · 06bc624
1 parent ff93839
commit 06bc624
Show file tree

Hide file tree

Showing 9 changed files with 1 addition and 5 deletions.
diff --git a/.zkp/merger_wrapper.bin b/.zkp/merger_wrapper.bin
diff --git a/.zkp/verifying_keys/merger_wrapper.bin b/.zkp/verifying_keys/merger_wrapper.bin
diff --git a/.zkp_testnet/merger_wrapper.bin b/.zkp_testnet/merger_wrapper.bin
diff --git a/.zkp_testnet/verifying_keys/merger_wrapper.bin b/.zkp_testnet/verifying_keys/merger_wrapper.bin
diff --git a/.zkp_tests/merger_wrapper.bin b/.zkp_tests/merger_wrapper.bin
diff --git a/.zkp_tests/toxic_waste.bin b/.zkp_tests/toxic_waste.bin
diff --git a/.zkp_tests/verifying_keys/merger_wrapper.bin b/.zkp_tests/verifying_keys/merger_wrapper.bin
diff --git a/blockchain/src/blockchain/zkp_sync.rs b/blockchain/src/blockchain/zkp_sync.rs
@@ -332,7 +332,7 @@ impl Blockchain {
         debug!(
             block = %this.state.main_chain.head,
             num_transactions,
-            kind = "zkp_extend",
+            kind = "push_macro",
             "Accepted block",
         );
 

diff --git a/lib/src/config/config.rs b/lib/src/config/config.rs
@@ -571,10 +571,6 @@ pub struct ClientConfig {
     #[builder(default)]
     pub consensus: ConsensusConfig,
 
-    /// ZKP propagation
-    #[builder(default)]
-    pub zkp_propagation: bool,
-
     /// The Nimiq network the client should connect to. Usually this should be either `Test` or
     /// `Main` for the Nimiq 1.0 networks. For Albatross there is currently only `TestAlbatross`
     /// and `DevAlbatross` available. Since Albatross is still in development at time of writing,