Skip to content

Commit

Permalink
bump neard version
Browse files Browse the repository at this point in the history
  • Loading branch information
bowenwang1996 committed Aug 22, 2020
1 parent 75d156f commit 32030d6
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 7 deletions.
2 changes: 1 addition & 1 deletion Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion chain/chain/src/chain.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1001,7 +1001,6 @@ impl Chain {
// New Tail can not be earlier than `prev_block.header.inner_lite.height`
chain_store_update.update_tail(new_tail);
// New Chunk Tail can not be earlier than minimum of height_created in Block `prev_block`
println!("resetting chunk tail to {}", new_chunk_tail);
chain_store_update.update_chunk_tail(new_chunk_tail);
chain_store_update.commit()?;

Expand Down
10 changes: 6 additions & 4 deletions chain/chunks/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -276,25 +276,27 @@ impl SealsManager {
match maybe_seal {
None => match self.past_seals.entry(height) {
btree_map::Entry::Vacant(vacant) => {
warn!(
// TODO(#3180): seals are disabled in single shard setting
/*warn!(
target: "chunks",
"A chunk at height {} with hash {:?} was approved without an active seal demur and no past seals were found at the same height",
height,
chunk_hash
);
);*/
let mut hashes = HashSet::new();
hashes.insert(chunk_hash.clone());
vacant.insert(hashes);
}
btree_map::Entry::Occupied(mut occupied) => {
let hashes = occupied.get_mut();
if !hashes.contains(chunk_hash) {
warn!(
// TODO(#3180): seals are disabled in single shard setting
/*warn!(
target: "chunks",
"Approved chunk at height {} with hash {:?} was not an active seal demur or a past seal",
height,
chunk_hash
);
);*/
hashes.insert(chunk_hash.clone());
}
}
Expand Down
2 changes: 1 addition & 1 deletion neard/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "neard"
version = "1.11.0-beta.1"
version = "1.10.0"
authors = ["Near Inc <hello@nearprotocol.com>"]
edition = "2018"
default-run = "neard"
Expand Down

0 comments on commit 32030d6

Please sign in to comment.