fix: CI fixes and resolved conflicts with master

ethereum · Sep 9, 2024 · 046a4e1 · 046a4e1
1 parent 9151527
commit 046a4e1
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 31 deletions.
diff --git a/trin-beacon/src/jsonrpc.rs b/trin-beacon/src/jsonrpc.rs
@@ -353,11 +353,7 @@ async fn offer(
 ) -> Result<Value, String> {
     match network
         .overlay
-        .send_offer(
-            enr,
-            content_key.to_bytes(),
-            content_value.encode().to_vec(),
-        )
+        .send_offer(enr, content_key.to_bytes(), content_value.encode().to_vec())
         .await
     {
         Ok(accept) => Ok(json!(AcceptInfo {
@@ -376,11 +372,7 @@ async fn trace_offer(
 ) -> Result<Value, String> {
     match network
         .overlay
-        .send_offer_trace(
-            enr,
-            content_key.to_bytes(),
-            content_value.encode().to_vec(),
-        )
+        .send_offer_trace(enr, content_key.to_bytes(), content_value.encode().to_vec())
         .await
     {
         Ok(accept) => Ok(json!(accept)),

diff --git a/trin-beacon/src/storage.rs b/trin-beacon/src/storage.rs
@@ -1,5 +1,4 @@
 use alloy_primitives::B256;
-use alloy_primitives::Bytes;
 use ethportal_api::{
     consensus::fork::ForkName,
     types::{

diff --git a/trin-history/src/jsonrpc.rs b/trin-history/src/jsonrpc.rs
@@ -339,11 +339,7 @@ async fn offer(
 ) -> Result<Value, String> {
     match network
         .overlay
-        .send_offer(
-            enr,
-            content_key.to_bytes(),
-            content_value.encode().to_vec(),
-        )
+        .send_offer(enr, content_key.to_bytes(), content_value.encode().to_vec())
         .await
     {
         Ok(accept) => Ok(json!(AcceptInfo {
@@ -362,11 +358,7 @@ async fn trace_offer(
 ) -> Result<Value, String> {
     match network
         .overlay
-        .send_offer_trace(
-            enr,
-            content_key.to_bytes(),
-            content_value.encode().to_vec(),
-        )
+        .send_offer_trace(enr, content_key.to_bytes(), content_value.encode().to_vec())
         .await
     {
         Ok(accept) => Ok(json!(accept)),

diff --git a/trin-state/src/jsonrpc.rs b/trin-state/src/jsonrpc.rs
@@ -309,11 +309,7 @@ async fn offer(
         "Offer",
         network
             .overlay
-            .send_offer(
-                enr,
-                content_key.to_bytes(),
-                content_value.encode().to_vec(),
-            )
+            .send_offer(enr, content_key.to_bytes(), content_value.encode().to_vec())
             .await
             .map(|accept| AcceptInfo {
                 content_keys: accept.content_keys,
@@ -331,11 +327,7 @@ async fn trace_offer(
         "TraceOffer",
         network
             .overlay
-            .send_offer_trace(
-                enr,
-                content_key.to_bytes(),
-                content_value.encode().to_vec(),
-            )
+            .send_offer_trace(enr, content_key.to_bytes(), content_value.encode().to_vec())
             .await,
     )
 }