Skip to content

Commit

Permalink
wip
Browse files Browse the repository at this point in the history
  • Loading branch information
mina86 committed Jun 1, 2023
1 parent f067ba7 commit b085179
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 11 deletions.
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
version = "0.0.0" # managed by cargo-workspaces, see below
authors = ["Near Inc <hello@nearprotocol.com>"]
edition = "2021"
rust-version = "1.69.0"
rust-version = "1.70.0"
repository = "https://github.com/near/nearcore"
license = "MIT OR Apache-2.0"

Expand Down
8 changes: 1 addition & 7 deletions chain/client-primitives/src/types.rs
Original file line number Diff line number Diff line change
Expand Up @@ -177,20 +177,14 @@ impl From<ShardSyncDownload> for ShardSyncDownloadView {
}
}

#[derive(Debug)]
#[derive(Debug, Default)]
pub struct StateSplitApplyingStatus {
/// total number of parts to be applied
pub total_parts: OnceCell<u64>,
/// number of parts that are done
pub done_parts: AtomicU64,
}

impl StateSplitApplyingStatus {
pub fn new() -> Self {
StateSplitApplyingStatus { total_parts: OnceCell::new(), done_parts: AtomicU64::new(0) }
}
}

/// Stores status of shard sync and statuses of downloading shards.
#[derive(Clone, Debug)]
pub struct ShardSyncDownload {
Expand Down
2 changes: 1 addition & 1 deletion chain/client/src/sync/state.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1151,7 +1151,7 @@ impl StateSync {
state_split_scheduler: &dyn Fn(StateSplitRequest),
me: &Option<AccountId>,
) -> Result<(), near_chain::Error> {
let status = Arc::new(StateSplitApplyingStatus::new());
let status = Arc::new(StateSplitApplyingStatus::default());
chain.build_state_for_split_shards_preprocessing(
&sync_hash,
shard_id,
Expand Down
2 changes: 1 addition & 1 deletion runtime/runtime-params-estimator/emu-cost/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# our local base image
FROM rust:1.69.0
FROM rust:1.70.0

LABEL description="Container for builds"

Expand Down
2 changes: 1 addition & 1 deletion rust-toolchain.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
# This specifies the version of Rust we use to build.
# Individual crates in the workspace may support a lower version, as indicated by `rust-version` field in each crate's `Cargo.toml`.
# The version specified below, should be at least as high as the maximum `rust-version` within the workspace.
channel = "1.69.0"
channel = "1.70.0"
components = [ "rustfmt" ]
targets = [ "wasm32-unknown-unknown" ]

0 comments on commit b085179

Please sign in to comment.