From dec90483d6911e76117cf5c1696298a0f2716475 Mon Sep 17 00:00:00 2001 From: Adam Wierzbicki Date: Thu, 23 May 2024 15:01:14 +0200 Subject: [PATCH] Tranport upgrade (v1.0.0-rc3) --- Cargo.lock | 16 ++++++++-------- Cargo.toml | 6 +++--- crates/logs-collector/Cargo.toml | 2 +- crates/logs-collector/src/storage.rs | 4 ++-- crates/network-scheduler/Cargo.toml | 2 +- crates/network-scheduler/src/data_chunk.rs | 6 ------ crates/query-gateway/Cargo.toml | 2 +- 7 files changed, 16 insertions(+), 22 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 9f609fa..110dd77 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1576,7 +1576,7 @@ checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" [[package]] name = "contract-client" version = "1.0.0-rc1" -source = "git+ssh://git@github.com/subsquid/subsquid-network.git#ed9ee4e612b407729cd59d90d2e1749e93f83981" +source = "git+https://github.com/subsquid/subsquid-network.git#aad87d907cb69316752c79f4b3c2fcb782f766b7" dependencies = [ "async-trait", "clap", @@ -4095,7 +4095,7 @@ checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" [[package]] name = "logs-collector" -version = "1.0.0-rc2" +version = "1.0.0-rc3" dependencies = [ "anyhow", "async-trait", @@ -4368,7 +4368,7 @@ dependencies = [ [[package]] name = "network-scheduler" -version = "1.0.0-rc2" +version = "1.0.0-rc3" dependencies = [ "anyhow", "async-trait", @@ -5204,7 +5204,7 @@ checksum = "106dd99e98437432fed6519dedecfade6a06a73bb7b2a1e019fdd2bee5778d94" [[package]] name = "query-gateway" -version = "1.0.0-rc2" +version = "1.0.0-rc3" dependencies = [ "anyhow", "axum", @@ -6373,8 +6373,8 @@ dependencies = [ [[package]] name = "subsquid-messages" -version = "1.0.0-rc2" -source = "git+ssh://git@github.com/subsquid/subsquid-network.git#ed9ee4e612b407729cd59d90d2e1749e93f83981" +version = "1.0.0-rc3" +source = "git+https://github.com/subsquid/subsquid-network.git#aad87d907cb69316752c79f4b3c2fcb782f766b7" dependencies = [ "anyhow", "hex", @@ -6388,8 +6388,8 @@ dependencies = [ [[package]] name = "subsquid-network-transport" -version = "1.0.0-rc2" -source = "git+ssh://git@github.com/subsquid/subsquid-network.git#ed9ee4e612b407729cd59d90d2e1749e93f83981" +version = "1.0.0-rc3" +source = "git+https://github.com/subsquid/subsquid-network.git#aad87d907cb69316752c79f4b3c2fcb782f766b7" dependencies = [ "anyhow", "async-trait", diff --git a/Cargo.toml b/Cargo.toml index 197ed3e..d41c4fa 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -3,6 +3,6 @@ members = ["crates/*"] resolver = "2" [workspace.dependencies] -contract-client = { git = "ssh://git@github.com/subsquid/subsquid-network.git", version = "1.0.0-rc1" } -subsquid-messages = { git = "ssh://git@github.com/subsquid/subsquid-network.git", version = "1.0.0-rc2" } -subsquid-network-transport = { git = "ssh://git@github.com/subsquid/subsquid-network.git", version = "1.0.0-rc2" } +contract-client = { git = "https://github.com/subsquid/subsquid-network.git", version = "1.0.0-rc1" } +subsquid-messages = { git = "https://github.com/subsquid/subsquid-network.git", version = "1.0.0-rc3" } +subsquid-network-transport = { git = "https://github.com/subsquid/subsquid-network.git", version = "1.0.0-rc3" } diff --git a/crates/logs-collector/Cargo.toml b/crates/logs-collector/Cargo.toml index 376d1b5..071ac6a 100644 --- a/crates/logs-collector/Cargo.toml +++ b/crates/logs-collector/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "logs-collector" -version = "1.0.0-rc2" +version = "1.0.0-rc3" edition = "2021" [dependencies] diff --git a/crates/logs-collector/src/storage.rs b/crates/logs-collector/src/storage.rs index 92022ac..1e7d5d6 100644 --- a/crates/logs-collector/src/storage.rs +++ b/crates/logs-collector/src/storage.rs @@ -293,7 +293,7 @@ mod tests { client_state_json: Some("".to_string()), signature: vec![], }; - query.sign(&client_keypair).unwrap(); + query.sign(&client_keypair); let mut query_log = QueryExecuted { client_id: client_id.to_string(), @@ -312,7 +312,7 @@ mod tests { }), })), }; - query_log.sign(&worker_keypair).unwrap(); + query_log.sign(&worker_keypair); storage .store_logs(std::iter::once(query_log.clone().try_into().unwrap())) diff --git a/crates/network-scheduler/Cargo.toml b/crates/network-scheduler/Cargo.toml index b323a6b..b9cde8c 100644 --- a/crates/network-scheduler/Cargo.toml +++ b/crates/network-scheduler/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "network-scheduler" -version = "1.0.0-rc2" +version = "1.0.0-rc3" edition = "2021" [dependencies] diff --git a/crates/network-scheduler/src/data_chunk.rs b/crates/network-scheduler/src/data_chunk.rs index 39d2690..ca8021a 100644 --- a/crates/network-scheduler/src/data_chunk.rs +++ b/crates/network-scheduler/src/data_chunk.rs @@ -94,7 +94,6 @@ pub fn chunks_to_assignment(chunks: impl Iterator) -> WorkerAs .map(|(dataset_id, chunks)| DatasetChunks { dataset_id: dataset_id.clone(), download_url: chunks.first().unwrap().download_url.clone(), - chunks_legacy: chunks.iter().map(|chunk| chunk.chunk_str.clone()).collect(), chunks: chunks .into_iter() .map(|chunk| AssignedChunk { @@ -199,10 +198,6 @@ mod tests { DatasetChunks { dataset_id: "s3://squidnet".to_string(), download_url: "https://squidnet.sqd-datasets.io".to_string(), - chunks_legacy: vec![ - "/00000/00001-01000-fa1f6773".to_string(), - "/00000/00500-01500-82315a24".to_string(), - ], chunks: vec![ AssignedChunk { path: "/00000/00001-01000-fa1f6773".to_string(), @@ -217,7 +212,6 @@ mod tests { DatasetChunks{ dataset_id: "s3://pepenet".to_string(), download_url: "https://pepenet.sqd-datasets.io".to_string(), - chunks_legacy: vec!["00000/01234-05678-b4357d89".to_string()], chunks: vec![ AssignedChunk { path: "00000/01234-05678-b4357d89".to_string(), diff --git a/crates/query-gateway/Cargo.toml b/crates/query-gateway/Cargo.toml index 2ec1931..4f8c70d 100644 --- a/crates/query-gateway/Cargo.toml +++ b/crates/query-gateway/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "query-gateway" -version = "1.0.0-rc2" +version = "1.0.0-rc3" edition = "2021" [dependencies]