chore: Bump toolchain (#287)

This commit is contained in:
Anatolios Laskaris 2023-11-21 16:55:05 +02:00 committed by GitHub
parent 0394560c06
commit acfa42850b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 512 additions and 697 deletions

View File

@ -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
with:
cache: false
uses: dsherret/rust-toolchain-file@v1
- name: Setup marine
uses: fluencelabs/setup-marine@v1

View File

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

View File

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

View File

@ -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"

1172
service/Cargo.lock generated

File diff suppressed because it is too large Load Diff

View File

@ -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"
sha2 = "=0.10.6"
fluence-keypair = "=0.8.1"
libp2p-core = { version = "=0.36.0", default-features = false, features = [ "secp256k1" ] }
thiserror = "=1.0.50"
sha2 = "=0.10.8"
fluence-keypair = "=0.10.3"
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"

View File

@ -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;

View File

@ -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()