chore: Merge Byron / Alonzo into single crate (#43)

txpipe · Feb 9, 2022 · fec96ff · fec96ff
1 parent e41a998
commit fec96ff
Show file tree

Hide file tree

Showing 61 changed files with 120 additions and 335 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -4,8 +4,7 @@ members = [
  "pallas-multiplexer",
  "pallas-miniprotocols",
  "pallas-crypto",
- "pallas-alonzo",
- "pallas-byron",
+ "pallas-primitives",
  "pallas",
 ]
 

diff --git a/README.md b/README.md
@@ -39,12 +39,12 @@ As already explained, _Pallas_ aims at being an expanding set of components. The
 
 ### Ouroboros Ledger
 
-| Crates | Description |
-| ------------------------------- | ----------------------------------------------------------------------- |
-| [pallas-alonzo](/pallas-alonzo) | Ledger primitives and cbor codec for the Alonzo era  |
-| pallas-ticking | Time passage implementation for consensus algorithm |
-| pallas-applying | Logic for validating and applying new blocks and txs to the chain state |
-| pallas-forecasting | Ledger forecasting algorithm to be used by the consensus layer |
+| Crates  | Description |
+| --------------------------------------- | ----------------------------------------------------------------------- |
+| [pallas-primitives](/pallas-primitives) | Ledger primitives and cbor codec for the different Cardano eras |
+| pallas-ticking  | Time passage implementation for consensus algorithm |
+| pallas-applying  | Logic for validating and applying new blocks and txs to the chain state |
+| pallas-forecasting  | Ledger forecasting algorithm to be used by the consensus layer |
 
 ## Etymology
 

diff --git a/examples/block-download/src/main.rs b/examples/block-download/src/main.rs
@@ -1,14 +1,18 @@
 use net2::TcpStreamExt;
 
-use pallas::ledger::alonzo::*;
-use pallas::ouroboros::network::blockfetch::{BatchClient, Observer};
-use pallas::ouroboros::network::handshake::{
- n2n::{Client, VersionTable},
- MAINNET_MAGIC,
+use pallas::network::{
+ miniprotocols::{
+ handshake::n2n::{Client, VersionTable},
+ run_agent, Point, MAINNET_MAGIC,
+ },
+ multiplexer::Multiplexer,
 };
-use pallas::ouroboros::network::machines::primitives::Point;
-use pallas::ouroboros::network::machines::run_agent;
-use pallas::ouroboros::network::multiplexer::Multiplexer;
+
+use pallas::{
+ ledger::primitives::{alonzo::*, Fragment},
+ network::miniprotocols::blockfetch::{BatchClient, Observer},
+};
+
 use std::net::TcpStream;
 
 #[derive(Debug)]

diff --git a/examples/byron-decoder/src/main.rs b/examples/byron-decoder/src/main.rs
@@ -1,14 +1,17 @@
 use net2::TcpStreamExt;
 
-use pallas::ledger::byron::*;
-use pallas::ouroboros::network::blockfetch::{BatchClient, Observer};
-use pallas::ouroboros::network::handshake::{
- n2n::{Client, VersionTable},
- MAINNET_MAGIC,
+use pallas::{
+ ledger::primitives::{byron::Block, Fragment},
+ network::{
+ miniprotocols::{
+ blockfetch::{BatchClient, Observer},
+ handshake::n2n::{Client, VersionTable},
+ run_agent, Point, MAINNET_MAGIC,
+ },
+ multiplexer::Multiplexer,
+ },
 };
-use pallas::ouroboros::network::machines::primitives::Point;
-use pallas::ouroboros::network::machines::run_agent;
-use pallas::ouroboros::network::multiplexer::Multiplexer;
+
 use std::net::TcpStream;
 
 #[derive(Debug)]

diff --git a/pallas-alonzo/Cargo.toml b/pallas-alonzo/Cargo.toml
diff --git a/pallas-alonzo/README.md b/pallas-alonzo/README.md
diff --git a/pallas-alonzo/src/lib.rs b/pallas-alonzo/src/lib.rs
diff --git a/pallas-alonzo/src/utils.rs b/pallas-alonzo/src/utils.rs
diff --git a/pallas-byron/README.md b/pallas-byron/README.md
diff --git a/pallas-byron/src/framework.rs b/pallas-byron/src/framework.rs
diff --git a/pallas-miniprotocols/Cargo.toml b/pallas-miniprotocols/Cargo.toml
@@ -22,4 +22,4 @@ net2 = "0.2.37"
 
 [dev-dependencies]
 env_logger = "0.9.0"
-pallas-alonzo = { version = "0.4.0", path = "../pallas-alonzo/" }
+pallas-primitives = { version = "0.4.0", path = "../pallas-primitives/" }
diff --git a/pallas-miniprotocols/examples/blockfetch.rs b/pallas-miniprotocols/examples/blockfetch.rs
@@ -1,13 +1,9 @@
 use net2::TcpStreamExt;
-use pallas_miniprotocols::Point;
 use std::net::TcpStream;
 
 use pallas_miniprotocols::blockfetch::{BatchClient, NoopObserver};
-use pallas_miniprotocols::handshake::{
- n2n::{Client, VersionTable},
- MAINNET_MAGIC,
-};
-use pallas_miniprotocols::run_agent;
+use pallas_miniprotocols::handshake::n2n::{Client, VersionTable};
+use pallas_miniprotocols::{run_agent, Point, MAINNET_MAGIC};
 use pallas_multiplexer::Multiplexer;
 
 fn main() {

diff --git a/pallas-miniprotocols/examples/chainsync-blocks.rs b/pallas-miniprotocols/examples/chainsync-blocks.rs
@@ -1,10 +1,9 @@
-use pallas_alonzo::{crypto, Block, BlockWrapper, Fragment};
+use pallas_primitives::alonzo::{crypto, Block, BlockWrapper};
+use pallas_primitives::Fragment;
 
 use pallas_miniprotocols::chainsync::{BlockLike, Consumer, NoopObserver};
 use pallas_miniprotocols::handshake::n2c::{Client, VersionTable};
-use pallas_miniprotocols::handshake::MAINNET_MAGIC;
-use pallas_miniprotocols::run_agent;
-use pallas_miniprotocols::Point;
+use pallas_miniprotocols::{run_agent, Point, MAINNET_MAGIC};
 use pallas_miniprotocols::{DecodePayload, EncodePayload, PayloadDecoder, PayloadEncoder};
 use pallas_multiplexer::Multiplexer;
 use std::os::unix::net::UnixStream;

diff --git a/pallas-miniprotocols/examples/chainsync-headers.rs b/pallas-miniprotocols/examples/chainsync-headers.rs
@@ -1,14 +1,15 @@
 use minicbor::data::Tag;
 use net2::TcpStreamExt;
-use pallas_alonzo::{crypto, Fragment, Header};
+use pallas_primitives::alonzo::{crypto, Header};
+use pallas_primitives::Fragment;
+
 use pallas_miniprotocols::Point;
 use std::net::TcpStream;
 
 use pallas_miniprotocols::chainsync::{BlockLike, Consumer, NoopObserver};
 use pallas_miniprotocols::handshake::n2n::{Client, VersionTable};
-use pallas_miniprotocols::handshake::MAINNET_MAGIC;
 use pallas_miniprotocols::{
- run_agent, DecodePayload, EncodePayload, PayloadDecoder, PayloadEncoder,
+ run_agent, DecodePayload, EncodePayload, PayloadDecoder, PayloadEncoder, MAINNET_MAGIC,
 };
 use pallas_multiplexer::Multiplexer;
 

diff --git a/pallas-miniprotocols/examples/handshake-client.rs b/pallas-miniprotocols/examples/handshake-client.rs
@@ -2,8 +2,7 @@ use net2::TcpStreamExt;
 use std::net::TcpStream;
 
 use pallas_miniprotocols::handshake::n2c::{Client, VersionTable};
-use pallas_miniprotocols::handshake::MAINNET_MAGIC;
-use pallas_miniprotocols::run_agent;
+use pallas_miniprotocols::{run_agent, MAINNET_MAGIC};
 use pallas_multiplexer::Multiplexer;
 
 fn main() {

diff --git a/pallas-miniprotocols/examples/handshake-node.rs b/pallas-miniprotocols/examples/handshake-node.rs
@@ -2,8 +2,7 @@ use net2::TcpStreamExt;
 use std::net::TcpStream;
 
 use pallas_miniprotocols::handshake::n2n::{Client, VersionTable};
-use pallas_miniprotocols::handshake::MAINNET_MAGIC;
-use pallas_miniprotocols::run_agent;
+use pallas_miniprotocols::{run_agent, MAINNET_MAGIC};
 use pallas_multiplexer::Multiplexer;
 
 fn main() {

diff --git a/pallas-miniprotocols/examples/localstate-chainpoint.rs b/pallas-miniprotocols/examples/localstate-chainpoint.rs
@@ -1,8 +1,10 @@
 use pallas_miniprotocols::handshake::n2c::{Client, VersionTable};
-use pallas_miniprotocols::handshake::MAINNET_MAGIC;
-use pallas_miniprotocols::localstate::queries::RequestV10;
-use pallas_miniprotocols::localstate::{queries::QueryV10, OneShotClient};
+use pallas_miniprotocols::localstate::{
+ queries::{QueryV10, RequestV10},
+ OneShotClient,
+};
 use pallas_miniprotocols::run_agent;
+use pallas_miniprotocols::MAINNET_MAGIC;
 use pallas_multiplexer::Multiplexer;
 use std::os::unix::net::UnixStream;
 

diff --git a/pallas-miniprotocols/examples/txsubmission-naive.rs b/pallas-miniprotocols/examples/txsubmission-naive.rs
@@ -2,9 +2,8 @@ use net2::TcpStreamExt;
 use std::net::TcpStream;
 
 use pallas_miniprotocols::handshake::n2c::{Client, VersionTable};
-use pallas_miniprotocols::handshake::MAINNET_MAGIC;
-use pallas_miniprotocols::run_agent;
 use pallas_miniprotocols::txsubmission::NaiveProvider;
+use pallas_miniprotocols::{run_agent, MAINNET_MAGIC};
 use pallas_multiplexer::Multiplexer;
 
 fn main() {

diff --git a/pallas-miniprotocols/src/blockfetch/mod.rs b/pallas-miniprotocols/src/blockfetch/mod.rs
@@ -5,7 +5,7 @@ use crate::machines::{
  Transition,
 };
 
-use crate::primitives::Point;
+use crate::common::Point;
 
 use log::debug;