resolve merge issues

2026-03-06 18:21:45 +00:00 · 2023-07-07 10:17:04 -04:00
parent cfe2452533
commit c4da1ba450
14 changed files with 143 additions and 109 deletions
--- a/beacon_node/http_api/tests/tests.rs
+++ b/beacon_node/http_api/tests/tests.rs
@@ -1264,7 +1264,11 @@ impl ApiTester {
            .await
            .0;

-        assert!(self.client.post_beacon_blocks(&SignedBlockContents::from(block)).await.is_err());
+        assert!(self
+            .client
+            .post_beacon_blocks(&SignedBlockContents::from(block))
+            .await
+            .is_err());

        assert!(
            self.network_rx.network_recv.recv().await.is_some(),