chore: fix merge artifacts

Author: kantai

stackslib/src/net/relay.rs

@@ -931,7 +931,7 @@ impl Relayer {
             &block.header.consensus_hash,
             &block.header.block_hash(),
             &obtained_method;
-            "block_id" => &block.header.block_id(),
+            "block_id" => %block.header.block_id(),
         );
 
         if fault_injection::ignore_block(block.header.chain_length, &burnchain.working_dir) {

stackslib/src/net/stackerdb/sync.rs

@@ -568,7 +568,6 @@ impl<NC: NeighborComms> StackerDBSync<NC> {
                         old_slot_id,
                         old_version,
                         new_inv.slot_versions[old_slot_id],
-                        &self.smart_contract_id,
                     );
                     resync = true;
                     break;
@@ -913,7 +912,6 @@ impl<NC: NeighborComms> StackerDBSync<NC> {
                         network.get_local_peer(),
                         &self.smart_contract_id,
                         &naddr,
-                        &self.smart_contract_id,
                         data.error_code
                     );
                     if data.error_code == NackErrorCodes::StaleView
@@ -1075,7 +1073,6 @@ impl<NC: NeighborComms> StackerDBSync<NC> {
                         network.get_local_peer(),
                         &self.smart_contract_id,
                         &naddr,
-                        &self.smart_contract_id,
                         data.error_code
                     );
                     if data.error_code == NackErrorCodes::StaleView