chore: Bump toolchain (#287)

.github/workflows/release.yml

@@ -50,13 +50,12 @@ jobs:
           ref: ${{ fromJson(needs.release-please.outputs.pr).headBranchName }}
 
       - name: Setup Rust toolchain
-        uses: actions-rust-lang/setup-rust-toolchain@v1
+        uses: dsherret/rust-toolchain-file@v1
 
       - name: Install cargo-edit
         uses: baptiste0928/cargo-install@v2.2.0
         with:
           crate: cargo-edit
-          version: 0.12.1
 
       - name: Get version
         id: version
@@ -118,9 +117,7 @@ jobs:
             kv/npmjs/fluencebot token | NODE_AUTH_TOKEN
 
       - name: Setup Rust toolchain
-        uses: actions-rust-lang/setup-rust-toolchain@v1
+        uses: dsherret/rust-toolchain-file@v1
-        with:
-          cache: false
 
       - name: Setup marine
         uses: fluencelabs/setup-marine@v1

.github/workflows/snapshot.yml

@@ -39,10 +39,8 @@ jobs:
           repository: fluencelabs/registry
           ref: ${{ inputs.ref }}
 
-      - name: Setup rust toolchain
+      - name: Setup Rust toolchain
-        uses: actions-rust-lang/setup-rust-toolchain@v1
+        uses: dsherret/rust-toolchain-file@v1
-        with:
-          cache: false
 
       - name: Set dependencies
         if: inputs.cargo-dependencies != 'null'

.github/workflows/tests.yml

@@ -86,9 +86,7 @@ jobs:
           flags: "--save-dev"
 
       - name: Setup Rust toolchain
-        uses: actions-rust-lang/setup-rust-toolchain@v1
+        uses: dsherret/rust-toolchain-file@v1
-        with:
-          cache: false
 
       - name: Setup marine
         uses: fluencelabs/setup-marine@v1

rust-toolchain.toml

@@ -1,5 +1,5 @@
 [toolchain]
-channel = "nightly-2023-02-27"
+channel = "nightly-2023-06-27"
 components = [ "rustfmt", "clippy" ]
 targets = [ "x86_64-unknown-linux-gnu", "x86_64-apple-darwin", "wasm32-wasi" ]
 profile = "minimal"

service/Cargo.toml

@@ -10,21 +10,21 @@ name = "registry"
 path = "src/main.rs"
 
 [dependencies]
-bs58 = "=0.4.0"
+bs58 = "=0.5.0"
 marine-rs-sdk = "=0.10.1"
 marine-sqlite-connector = "=0.9.1"
 fstrings = "=0.2.3"
 boolinator = "=2.4.0"
-toml = "=0.7.3"
+toml = "=0.8.8"
 serde = { version = "1.0.188", features = ["derive"] }
-thiserror = "=1.0.40"
+thiserror = "=1.0.50"
-sha2 = "=0.10.6"
+sha2 = "=0.10.8"
-fluence-keypair = "=0.8.1"
+fluence-keypair = "=0.10.3"
-libp2p-core = { version = "=0.36.0", default-features = false, features = [ "secp256k1" ] }
+libp2p-identity = "=0.2.7"
 
 [dev-dependencies]
 marine-rs-sdk-test = "=0.11.0"
-rusqlite = "=0.28.0"
+rusqlite = "=0.30.0"
 
 [build-dependencies]
 marine-rs-sdk-test = "=0.11.0"

service/src/misc.rs

@@ -18,7 +18,7 @@ use crate::error::ServiceError;
 use crate::WeightResult;
 use boolinator::Boolinator;
 use fluence_keypair::PublicKey;
-use libp2p_core::PeerId;
+use libp2p_identity::PeerId;
 use std::convert::TryFrom;
 use std::str::FromStr;
 

service/src/record_api.rs

@@ -194,7 +194,7 @@ pub fn republish_records(
 pub fn merge_two(a: Vec<Record>, b: Vec<Record>) -> MergeResult {
     merge_records(
         a.into_iter()
-            .chain(b.into_iter())
+            .chain(b)
             .map(|record| RecordInternal {
                 record,
                 ..Default::default()