Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ members = [
"crates/rpc",
"crates/storage",
"crates/subnetworks/beacon",
"crates/subnetworks/history",
"crates/subnetworks/legacy-history",
"crates/subnetworks/state",
"crates/utils",
"crates/validation",
Expand Down Expand Up @@ -115,7 +115,7 @@ trin = { path = "bin/trin"}
trin-beacon = { path = "crates/subnetworks/beacon" }
trin-evm = { path = "crates/evm" }
trin-execution = { path = "bin/trin-execution" }
trin-history = { path = "crates/subnetworks/history" }
trin-legacy-history = { path = "crates/subnetworks/legacy-history" }
trin-metrics = { path = "crates/metrics" }
trin-state = { path = "crates/subnetworks/state" }
trin-storage = { path = "crates/storage" }
Expand Down
2 changes: 1 addition & 1 deletion bin/portal-bridge/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ tracing.workspace = true
tree_hash.workspace = true
trin.workspace = true
trin-beacon.workspace = true
trin-history.workspace = true
trin-legacy-history.workspace = true
trin-state.workspace = true
trin-storage.workspace = true
trin-evm.workspace = true
Expand Down
2 changes: 1 addition & 1 deletion bin/portal-bridge/src/bridge/e2hs.rs
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ use tokio::{
time::{sleep, timeout},
};
use tracing::{debug, error, info, warn};
use trin_history::network::LegacyHistoryNetwork;
use trin_legacy_history::network::LegacyHistoryNetwork;
use trin_metrics::bridge::BridgeMetricsReporter;
use trin_validation::header_validator::HeaderValidator;

Expand Down
2 changes: 1 addition & 1 deletion bin/portal-bridge/src/bridge/ephemeral_history/gossiper.rs
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ use tokio::{
time::{sleep, timeout},
};
use tracing::{error, info, warn};
use trin_history::network::LegacyHistoryNetwork;
use trin_legacy_history::network::LegacyHistoryNetwork;
use trin_metrics::bridge::BridgeMetricsReporter;

use super::ephemeral_bundle::EphemeralBundle;
Expand Down
2 changes: 1 addition & 1 deletion bin/portal-bridge/src/bridge/ephemeral_history/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ use revm_primitives::B256;
use tokio::task::JoinHandle;
use tracing::{error, info, warn};
use tree_hash::TreeHash;
use trin_history::network::LegacyHistoryNetwork;
use trin_legacy_history::network::LegacyHistoryNetwork;
use trin_metrics::bridge::BridgeMetricsReporter;

use crate::census::Census;
Expand Down
2 changes: 1 addition & 1 deletion bin/trin/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ tokio.workspace = true
tracing.workspace = true
tree_hash.workspace = true
trin-beacon.workspace = true
trin-history.workspace = true
trin-legacy-history.workspace = true
trin-state.workspace = true
trin-storage.workspace = true
trin-utils.workspace = true
Expand Down
2 changes: 1 addition & 1 deletion bin/trin/src/handle.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ use std::sync::Arc;
use anyhow::bail;
use rpc::RpcServerHandle;
use trin_beacon::network::BeaconNetwork;
use trin_history::network::LegacyHistoryNetwork;
use trin_legacy_history::network::LegacyHistoryNetwork;
use trin_state::network::StateNetwork;

pub struct TrinHandle {
Expand Down
2 changes: 1 addition & 1 deletion bin/trin/src/run.rs
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ use rpc::{config::RpcConfig, launch_jsonrpc_server, RpcServerHandle};
use tokio::sync::{mpsc, RwLock};
use tracing::info;
use trin_beacon::initialize_beacon_network;
use trin_history::initialize_legacy_history_network;
use trin_legacy_history::initialize_legacy_history_network;
use trin_state::initialize_state_network;
use trin_storage::{config::StorageCapacityConfig, PortalStorageConfigFactory};
#[cfg(windows)]
Expand Down
4 changes: 2 additions & 2 deletions book/src/developers/architecture/workspaces.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ This crate is responsible for the code that defines the main functions and data
- Database management
- Ethereum related data structures

## `trin-history`
## `trin-legacy-history`

This crate is responsible for the History sub-protocol. This means interacting with peers
to retrieve and distribute the following:
Expand All @@ -46,7 +46,7 @@ be treated as a member of the broader family of `OverlayContentKey`s.

> This crate exists mostly as a stub for future work.

This crate is equivalent in function to the `trin-history` crate, but instead is responsible
This crate is equivalent in function to the `trin-legacy-history` crate, but instead is responsible
for the State sub-protocol.

This means that it is responsible for:
Expand Down
8 changes: 4 additions & 4 deletions book/src/developers/quick_setup.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@ cargo build --workspace
cargo test --workspace

# Build and run test suite for an individual crate
cargo build -p trin-history
cargo test -p trin-history
cargo build -p trin-legacy-history
cargo test -p trin-legacy-history

# Run
cargo run
Expand Down Expand Up @@ -105,8 +105,8 @@ cargo build --workspace
cargo test --workspace

# Build and run test suite for an individual crate
cargo build -p trin-history
cargo test -p trin-history
cargo build -p trin-legacy-history
cargo test -p trin-legacy-history

# Run help
cargo run -- --help
Expand Down
2 changes: 1 addition & 1 deletion crates/portalnet/README.md
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# Portalnet
An implementation of the base layer of the Portal Network. See trin-history for an example overlay network in practice, storing chain history.
An implementation of the base layer of the Portal Network. See trin-legacy-history for an example overlay network in practice, storing chain history.
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[package]
name = "trin-history"
name = "trin-legacy-history"
description = "Legacy History network subprotocol for Trin."
authors.workspace = true
categories.workspace = true
Expand Down
2 changes: 0 additions & 2 deletions testing/ethportal-peertest/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,6 @@ tracing.workspace = true
tracing-subscriber.workspace = true
tree_hash.workspace = true
trin.workspace = true
trin-history.workspace = true
trin-state.workspace = true
trin-utils.workspace = true
trin-validation.workspace = true
url.workspace = true
Expand Down
Loading