refactor: rename history_new and header_with_proof_new by removing _new (#1724)

Author: morph-dev

bin/portal-bridge/src/api/execution.rs

@@ -10,7 +10,7 @@ use ethportal_api::{
                 BlockBody, BlockBodyLegacy, BlockBodyMerge, BlockBodyShanghai, MERGE_TIMESTAMP,
                 SHANGHAI_TIMESTAMP,
             },
-            header_with_proof_new::{BlockHeaderProof, HeaderWithProof},
+            header_with_proof::{BlockHeaderProof, HeaderWithProof},
         },
         jsonrpc::{params::Params, request::JsonRequest},
     },

crates/ethportal-api/src/lib.rs

@@ -36,7 +36,7 @@ pub use types::{
         state::StateContentKey,
     },
     content_value::{
-        beacon::BeaconContentValue, error::ContentValueError, history_new::HistoryContentValue,
+        beacon::BeaconContentValue, error::ContentValueError, history::HistoryContentValue,
         state::StateContentValue, ContentValue,
     },
     discv5::*,

crates/ethportal-api/src/types/content_value/history_new.rs renamed to crates/ethportal-api/src/types/content_value/history.rs

@@ -2,7 +2,7 @@ use ssz::{Decode, Encode};
 
 use crate::{
     types::{
-        content_value::ContentValue, execution::header_with_proof_new::HeaderWithProof,
+        content_value::ContentValue, execution::header_with_proof::HeaderWithProof,
         network::Subnetwork,
     },
     utils::bytes::hex_encode,

crates/ethportal-api/src/types/content_value/mod.rs

@@ -6,7 +6,7 @@ use crate::{
 pub mod beacon;
 pub mod constants;
 pub mod error;
-pub mod history_new;
+pub mod history;
 pub mod state;
 
 /// An encodable portal network content value.

crates/ethportal-api/src/types/execution/header_with_proof_new.rs renamed to crates/ethportal-api/src/types/execution/header_with_proof.rs

@@ -1,7 +1,7 @@
 pub mod accumulator;
 pub mod block_body;
 pub mod header;
-pub mod header_with_proof_new;
+pub mod header_with_proof;
 pub mod receipts;
 pub mod transaction;
 pub mod withdrawal;

crates/ethportal-api/src/types/execution/mod.rs

@@ -4,7 +4,7 @@ use alloy::primitives::B256;
 use anyhow::{anyhow, ensure};
 use ethportal_api::{
     types::execution::{
-        block_body::BlockBody, header::Header, header_with_proof_new::HeaderWithProof,
+        block_body::BlockBody, header::Header, header_with_proof::HeaderWithProof,
         receipts::Receipts,
     },
     utils::bytes::hex_encode,

crates/subnetworks/history/src/validation.rs

@@ -171,7 +171,7 @@ mod tests {
     use anyhow::Result;
     use ethportal_api::{
         types::{
-            execution::header_with_proof_new::{BlockHeaderProof, HeaderWithProof},
+            execution::header_with_proof::{BlockHeaderProof, HeaderWithProof},
             jsonrpc::{endpoints::HistoryEndpoint, json_rpc_mock::MockJsonRpcBuilder},
             portal::GetContentInfo,
         },

crates/subnetworks/state/src/validation/validator.rs

@@ -4,7 +4,7 @@ use alloy::primitives::{B256, U256};
 use anyhow::anyhow;
 use ethportal_api::types::execution::{
     accumulator::EpochAccumulator, header::Header,
-    header_with_proof_new::BlockProofHistoricalHashesAccumulator,
+    header_with_proof::BlockProofHistoricalHashesAccumulator,
 };
 use serde::{Deserialize, Serialize};
 use ssz::Decode;

crates/validation/src/accumulator.rs

@@ -2,7 +2,7 @@ use alloy::primitives::B256;
 use anyhow::anyhow;
 use ethportal_api::{
     consensus::historical_summaries::HistoricalSummaries,
-    types::execution::header_with_proof_new::{
+    types::execution::header_with_proof::{
         BlockHeaderProof, BlockProofHistoricalRoots, BlockProofHistoricalSummaries, HeaderWithProof,
     },
     Header,
@@ -224,7 +224,7 @@ mod test {
     use ethportal_api::{
         types::execution::{
             accumulator::EpochAccumulator,
-            header_with_proof_new::{BlockHeaderProof, HeaderWithProof},
+            header_with_proof::{BlockHeaderProof, HeaderWithProof},
         },
         utils::bytes::{hex_decode, hex_encode},
         HistoryContentKey, OverlayContentKey,