Skip to content

Commit

Permalink
nits
Browse files Browse the repository at this point in the history
  • Loading branch information
wacban committed Aug 10, 2023
1 parent 108d50e commit 5bd6d6c
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 4 deletions.
1 change: 0 additions & 1 deletion chain/chain/src/chain.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2578,7 +2578,6 @@ impl Chain {
self.validate_chunk_headers(&block, &prev_block)?;

self.ping_missing_chunks(me, prev_hash, block)?;

let incoming_receipts = self.collect_incoming_receipts_from_block(me, block)?;

// Check if block can be finalized and drop it otherwise.
Expand Down
3 changes: 2 additions & 1 deletion chain/chunks/src/logic.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ use near_primitives::{
},
types::{AccountId, ShardId},
};
use tracing::log::error;
use tracing::log::{debug, error};

pub fn need_receipt(
prev_block_hash: &CryptoHash,
Expand Down Expand Up @@ -152,6 +152,7 @@ pub fn decode_encoded_chunk(
Ok(shard_chunk)
})
{
debug!(target: "chunks", "Reconstructed and decoded chunk {}, encoded length was {}, num txs: {}, I'm {:?}", chunk_hash.0, encoded_chunk.encoded_length(), shard_chunk.transactions().len(), me);
let partial_chunk = create_partial_chunk(
encoded_chunk,
merkle_paths,
Expand Down
3 changes: 1 addition & 2 deletions integration-tests/src/tests/client/sharding_upgrade.rs
Original file line number Diff line number Diff line change
Expand Up @@ -203,8 +203,7 @@ impl TestShardUpgradeEnv {
client.epoch_manager.get_epoch_id_from_prev_block(&head.last_block_hash).unwrap();
let block_producer =
client.epoch_manager.get_block_producer(&epoch_id, height).unwrap();
let _span = tracing::debug_span!(target: "test", "", client=?block_producer);
let _span = _span.entered();
let _span = tracing::debug_span!(target: "test", "", client=?block_producer).entered();
let block_producer_client = env.client(&block_producer);
let mut block = block_producer_client.produce_block(height).unwrap().unwrap();
set_block_protocol_version(&mut block, block_producer.clone(), protocol_version);
Expand Down

0 comments on commit 5bd6d6c

Please sign in to comment.