fix: compile-time merge errors

stacks-network · Aug 15, 2023 · 9b85505 · 9b85505
1 parent 39ac9c6
commit 9b85505
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 11 deletions.
diff --git a/stackslib/src/net/rpc.rs b/stackslib/src/net/rpc.rs
@@ -2557,7 +2557,7 @@ impl ConversationHttp {
             let resp = HttpResponseType::NotFound(response_metadata, "No such StackerDB".into());
             return resp.send(http, fd).and_then(|_| Ok(()));
         }
-        if let Err(e) = tx.try_replace_chunk(
+        if let Err(_e) = tx.try_replace_chunk(
             stackerdb_contract_id,
             &stackerdb_chunk.get_slot_metadata(),
             &stackerdb_chunk.data,

diff --git a/stackslib/src/net/stackerdb/config.rs b/stackslib/src/net/stackerdb/config.rs
@@ -283,7 +283,7 @@ impl StackerDBConfig {
             .expect_u128();
 
         if chunk_size > STACKERDB_MAX_CHUNK_SIZE as u128 {
-            debug!(
+            let reason = format!(
                 "Contract {} stipulates a chunk size beyond STACKERDB_MAX_CHUNK_SIZE",
                 contract_id
             );

diff --git a/stackslib/src/net/stackerdb/sync.rs b/stackslib/src/net/stackerdb/sync.rs
@@ -1036,16 +1036,9 @@ impl<NC: NeighborComms> StackerDBSync<NC> {
                 &naddr
             );
 
-            if let Some((slot_id, slot_version)) = self.chunk_push_receipts.get(&naddr) {
+            if let Some((slot_id, _)) = self.chunk_push_receipts.get(&naddr) {
                 self.need_resync = self.need_resync
-                    || self.add_pushed_chunk(
-                        network,
-                        naddr,
-                        new_chunk_inv,
-                        *slot_id,
-                        *slot_version,
-                    );
-                self.add_pushed_chunk(naddr, new_chunk_inv, *slot_id);
+                    || self.add_pushed_chunk(network, naddr, new_chunk_inv, *slot_id);
             }
         }