fix: remove dependency on native-tls entirely

graphops · May 27, 2024 · 1f8c57e · 1f8c57e
1 parent 5d23313
commit 1f8c57e
Show file tree

Hide file tree

Showing 14 changed files with 44 additions and 140 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -12,7 +12,7 @@ panic = 'unwind'
 opt-level = 3
 
 [workspace.dependencies]
-graphcast-sdk = "0.7.1"
+graphcast-sdk = { git= "https://github.com/graphops/graphcast-sdk" }
 clap = { version = "4.4", features = [
     "cargo",
     "unstable-doc",

diff --git a/Dockerfile b/Dockerfile
@@ -7,7 +7,6 @@ RUN apt-get update \
         curl \
         libpq-dev \
         pkg-config \
-        libssl-dev \
         clang \
         build-essential \
         libc6-dev \

diff --git a/subgraph-radio/Cargo.toml b/subgraph-radio/Cargo.toml
@@ -24,7 +24,7 @@ tokio = { version = "1.28.1", features = ["full", "rt"] }
 anyhow = "1.0"
 graphql_client = "0.12.0"
 serde_derive = "1.0"
-reqwest = { version = "0.11.17", features = ["json"] }
+reqwest = { version = "0.11.24", default-features = false, features = ["json", "rustls-tls"] }
 thiserror = "1.0.40"
 ethers = "2.0.4"
 ethers-contract = "2.0.4"

diff --git a/subgraph-radio/src/operator/attestation.rs b/subgraph-radio/src/operator/attestation.rs
@@ -484,7 +484,7 @@ pub fn compare_attestations(
     ipfs_hash: &str,
     allocated_subgraphs: HashSet<String>,
 ) -> ComparisonResult {
-    let allocated = allocated_subgraphs.contains(&ipfs_hash.to_string());
+    let allocated = allocated_subgraphs.contains(ipfs_hash);
 
     // Attempt to retrieve remote attestations for the given IPFS hash and block number
     let remote_attestations = remote

diff --git a/test-runner/src/invalid_block_hash.rs b/test-runner/src/invalid_block_hash.rs
@@ -21,7 +21,7 @@ pub async fn invalid_block_hash_test() {
 
     let mut config = test_config();
     config.radio_setup.sqlite_file_path = Some(db_path.clone());
-    config.radio_setup.topics = radio_topics.clone();
+    config.radio_setup.topics.clone_from(&radio_topics);
 
     let mut test_sender_config = TestSenderConfig {
         topics: test_sender_topics,

diff --git a/test-runner/src/invalid_nonce.rs b/test-runner/src/invalid_nonce.rs
@@ -20,7 +20,7 @@ pub async fn invalid_nonce_test() {
 
     let mut config = test_config();
     config.radio_setup.sqlite_file_path = Some(db_path.clone());
-    config.radio_setup.topics = radio_topics.clone();
+    config.radio_setup.topics.clone_from(&radio_topics);
 
     let mut test_sender_config = TestSenderConfig {
         topics: test_sender_topics,

diff --git a/test-runner/src/invalid_sender.rs b/test-runner/src/invalid_sender.rs
@@ -22,7 +22,7 @@ pub async fn invalid_sender_test() {
 
     let mut config = test_config();
     config.radio_setup.sqlite_file_path = Some(db_path.clone());
-    config.radio_setup.topics = radio_topics.clone();
+    config.radio_setup.topics.clone_from(&radio_topics);
     config.radio_setup.id_validation = IdentityValidation::RegisteredIndexer;
 
     let mut test_sender_config = TestSenderConfig {

diff --git a/test-runner/src/message_handling.rs b/test-runner/src/message_handling.rs
@@ -40,7 +40,7 @@ pub async fn send_and_receive_test() {
 
     let mut config = test_config();
     config.radio_setup.sqlite_file_path = Some(db_path.clone());
-    config.radio_setup.topics = radio_topics.clone();
+    config.radio_setup.topics.clone_from(&radio_topics);
     config.radio_setup.topic_update_interval = 90;
 
     let mut test_sender_config = TestSenderConfig {

diff --git a/test-runner/src/poi_divergent.rs b/test-runner/src/poi_divergent.rs
@@ -24,7 +24,7 @@ pub async fn poi_divergent_test() {
 
     let mut config = test_config();
     config.radio_setup.sqlite_file_path = Some(db_path.clone());
-    config.radio_setup.topics = radio_topics.clone();
+    config.radio_setup.topics.clone_from(&radio_topics);
 
     let mut test_sender_config = TestSenderConfig {
         topics: test_sender_topics,

diff --git a/test-runner/src/poi_match.rs b/test-runner/src/poi_match.rs
@@ -24,7 +24,7 @@ pub async fn poi_match_test() {
 
     let mut config = test_config();
     config.radio_setup.sqlite_file_path = Some(db_path.clone());
-    config.radio_setup.topics = radio_topics.clone();
+    config.radio_setup.topics.clone_from(&radio_topics);
 
     let mut test_sender_config = TestSenderConfig {
         topics: test_sender_topics,