Skip to content

Commit

Permalink
chore: update rust version to 1.80.0 (#1421)
Browse files Browse the repository at this point in the history
  • Loading branch information
KolbyML authored Sep 5, 2024
1 parent 23918cb commit 74a5e0e
Show file tree
Hide file tree
Showing 10 changed files with 21 additions and 21 deletions.
8 changes: 4 additions & 4 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ executors:
environment:
IMAGE_NAME: portalnetwork/trin
docker:
- image: cimg/rust:1.79.0
- image: cimg/rust:1.80.0
docker-nightly:
docker:
- image: rustlang/rust:nightly
Expand Down Expand Up @@ -153,7 +153,7 @@ jobs:
resource_class: xlarge
executor:
name: rust/default
tag: 1.79.0
tag: 1.80.0
environment:
RUSTFLAGS: "-D warnings"
RUST_LOG: "debug"
Expand All @@ -174,7 +174,7 @@ jobs:
resource_class: xlarge
executor:
name: rust/default
tag: 1.79.0
tag: 1.80.0
environment:
RUSTFLAGS: "-D warnings"
RUST_LOG: "debug"
Expand Down Expand Up @@ -211,7 +211,7 @@ jobs:
resource_class: 2xlarge
executor:
name: rust/default
tag: 1.79.0
tag: 1.80.0
environment:
RUSTFLAGS: "-D warnings"
RUST_LOG: "debug,html5ever=error,selectors=error,discv5::service=info"
Expand Down
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name = "trin"
version = "0.1.0"
authors = ["https://github.com/ethereum/trin/graphs/contributors"]
edition = "2021"
rust-version = "1.79.0"
rust-version = "1.80.0"
default-run = "trin"
repository = "https://github.com/ethereum/trin"
license = "GPL-3.0"
Expand Down
6 changes: 3 additions & 3 deletions book/src/developers/contributing/releases/deployment.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
- Get access to cluster repo (add person to @trin-deployments)
- `git clone` the cluster repo: https://github.com/ethereum/cluster.git
- Install dependencies within `cluster` virtualenv:
```shell=
```bash
cd cluster
python3 -m venv venv
. venv/bin/activate
Expand Down Expand Up @@ -35,7 +35,7 @@
### Update Docker images
Docker images are how Ansible moves the binaries to the nodes. Update the Docker tags with:
```shell=
```shell
docker pull portalnetwork/trin:latest
docker pull portalnetwork/trin:latest-bridge
docker image tag portalnetwork/trin:latest portalnetwork/trin:testnet
Expand Down Expand Up @@ -105,7 +105,7 @@ Note that building the Docker image on git's master takes some time. If you merg
### Why can't I decrypt the SOPS file?
You might see this when running ansible, or the sops check:
```shell=
```shell
Failed to get the data key required to decrypt the SOPS file.
Group 0: FAILED
Expand Down
2 changes: 1 addition & 1 deletion book/src/developers/quick_setup.md
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ rustc --version
You should see something like:

```bash
rustc 1.79.0 (129f3b996 2024-06-10)
rustc 1.80.0 (051478957 2024-07-21)
```

Next, install the required dependencies:
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# select build image
FROM rust:1.79.0 AS builder
FROM rust:1.80.0 AS builder

# create a new empty shell project
RUN USER=root cargo new --bin trin
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile.bridge
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ RUN mkdir /portal-accumulators
COPY ./portal-accumulators /portal-accumulators

# select build image
FROM rust:1.79.0 AS builder
FROM rust:1.80.0 AS builder

# create a new empty shell project
RUN USER=root cargo new --bin trin
Expand Down
2 changes: 1 addition & 1 deletion rust-toolchain.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
# The default profile includes rustc, rust-std, cargo, rust-docs, rustfmt and clippy.
# https://rust-lang.github.io/rustup/concepts/profiles.html
profile = "default"
channel = "1.79.0"
channel = "1.80.0"
10 changes: 5 additions & 5 deletions trin-beacon/src/storage.rs
Original file line number Diff line number Diff line change
Expand Up @@ -730,7 +730,7 @@ mod test {
let key = BeaconContentKey::LightClientBootstrap(LightClientBootstrapKey {
block_hash: *block_root,
});
storage.put(key.clone(), &value.as_ssz_bytes()).unwrap();
storage.put(key.clone(), value.as_ssz_bytes()).unwrap();
let result = storage.get(&key).unwrap().unwrap();
assert_eq!(result, value.as_ssz_bytes());
}
Expand All @@ -750,7 +750,7 @@ mod test {
lc_update_1.clone(),
])
.unwrap();
storage.put(key.clone(), &value.as_ssz_bytes()).unwrap();
storage.put(key.clone(), value.as_ssz_bytes()).unwrap();
let result = storage.get(&key).unwrap().unwrap();

assert_eq!(result, value.as_ssz_bytes());
Expand Down Expand Up @@ -786,7 +786,7 @@ mod test {
let key = BeaconContentKey::LightClientFinalityUpdate(LightClientFinalityUpdateKey {
finalized_slot,
});
storage.put(key.clone(), &value.as_ssz_bytes()).unwrap();
storage.put(key.clone(), value.as_ssz_bytes()).unwrap();
let result = storage.get(&key).unwrap().unwrap();
assert_eq!(result, value.as_ssz_bytes());

Expand Down Expand Up @@ -825,7 +825,7 @@ mod test {
let key = BeaconContentKey::LightClientOptimisticUpdate(LightClientOptimisticUpdateKey {
signature_slot,
});
storage.put(key.clone(), &value.as_ssz_bytes()).unwrap();
storage.put(key.clone(), value.as_ssz_bytes()).unwrap();
let result = storage.get(&key).unwrap().unwrap();
assert_eq!(result, value.as_ssz_bytes());

Expand Down Expand Up @@ -864,7 +864,7 @@ mod test {
let key = BeaconContentKey::HistoricalSummariesWithProof(HistoricalSummariesWithProofKey {
epoch,
});
storage.put(key.clone(), &value.as_ssz_bytes()).unwrap();
storage.put(key.clone(), value.as_ssz_bytes()).unwrap();
let result = storage.get(&key).unwrap().unwrap();
assert_eq!(result, value.as_ssz_bytes());

Expand Down
6 changes: 3 additions & 3 deletions trin-storage/src/versioned/id_indexed_v1/pruning_strategy.rs
Original file line number Diff line number Diff line change
Expand Up @@ -77,12 +77,12 @@ impl Default for PruningConfig {
/// Ideally, we would want to prune down to `target_capacity_bytes`, but this would usually be too
/// slow. The `max_pruning_count` represents the maximum number of entries that we will prune at
/// one point, and it will be updated based on how long it takes in comparison to
/// `optimal_pruning_duration_range`:
/// `optimal_pruning_duration_range`:
/// - it will not change if pruning duration falls within `optimal_pruning_duration_range`
/// - it will increase by `max_pruning_count_change_fraction` if pruning duration is below the
/// `optimal_pruning_duration_range`
/// `optimal_pruning_duration_range`
/// - it will decrease by `max_pruning_count_change_fraction` if pruning duration is above the
/// `optimal_pruning_duration_range`
/// `optimal_pruning_duration_range`
pub struct PruningStrategy {
/// The store configuration.
config: IdIndexedV1StoreConfig,
Expand Down
2 changes: 1 addition & 1 deletion utp-testing/docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM rust:1.79.0-bullseye AS builder
FROM rust:1.80.0-bullseye AS builder

RUN apt-get update \
&& apt-get install clang -y \
Expand Down

0 comments on commit 74a5e0e

Please sign in to comment.