From 587bfc4577d3ad1a2e5d850e6d3dfef5017fb80a Mon Sep 17 00:00:00 2001 From: chriseth Date: Tue, 30 Aug 2022 23:30:38 +0200 Subject: [PATCH] Restructure source. --- src/flow/adjacencies.rs | 3 +++ src/flow/mod.rs | 12 ++++++++++++ src/io.rs | 4 +--- src/main.rs | 5 ++--- src/{ => types}/address.rs | 0 src/{ => types}/edge.rs | 4 ++-- src/types/mod.rs | 7 +++++++ src/{ => types}/u256.rs | 0 8 files changed, 27 insertions(+), 8 deletions(-) create mode 100644 src/flow/adjacencies.rs create mode 100644 src/flow/mod.rs rename src/{ => types}/address.rs (100%) rename src/{ => types}/edge.rs (84%) create mode 100644 src/types/mod.rs rename src/{ => types}/u256.rs (100%) diff --git a/src/flow/adjacencies.rs b/src/flow/adjacencies.rs new file mode 100644 index 0000000..4f914f3 --- /dev/null +++ b/src/flow/adjacencies.rs @@ -0,0 +1,3 @@ +struct Adjacencies { + +} \ No newline at end of file diff --git a/src/flow/mod.rs b/src/flow/mod.rs new file mode 100644 index 0000000..c76a6ca --- /dev/null +++ b/src/flow/mod.rs @@ -0,0 +1,12 @@ +use crate::address::Address; +use crate::edge::Edge; +use crate::u256::U256; + +enum Node { + Node(Address), + TokenEdge(Address, Address), +} + +fn pseudoNode(edge: Edge) -> Node { + Node::TokenEdge(edge.from, edge.to) +} \ No newline at end of file diff --git a/src/io.rs b/src/io.rs index 5cec6f2..639d18c 100644 --- a/src/io.rs +++ b/src/io.rs @@ -4,9 +4,7 @@ use std::fs::File; use std::io; use std::io::Read; -use crate::address::Address; -use crate::edge::Edge; -use crate::u256::U256; +use crate::types::{Address, Edge, U256}; pub fn read_edges_binary(path: &String) -> Result, io::Error> { let mut f = File::open(path)?; diff --git a/src/main.rs b/src/main.rs index 322fe9f..8841ca2 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,7 +1,6 @@ -mod address; -mod edge; +mod flow; mod io; -mod u256; +mod types; fn main() { let edges = io::read_edges_binary(&String::from("./edges.dat")).expect("Error loading edges."); diff --git a/src/address.rs b/src/types/address.rs similarity index 100% rename from src/address.rs rename to src/types/address.rs diff --git a/src/edge.rs b/src/types/edge.rs similarity index 84% rename from src/edge.rs rename to src/types/edge.rs index 498e0c7..e024dae 100644 --- a/src/edge.rs +++ b/src/types/edge.rs @@ -1,5 +1,5 @@ -use crate::address::Address; -use crate::u256::U256; +use crate::types::Address; +use crate::types::U256; #[derive(Clone, Copy, Debug, Default, Hash, PartialEq, PartialOrd)] pub struct Edge { diff --git a/src/types/mod.rs b/src/types/mod.rs new file mode 100644 index 0000000..7a8914a --- /dev/null +++ b/src/types/mod.rs @@ -0,0 +1,7 @@ +pub mod address; +pub mod edge; +pub mod u256; + +pub use address::Address; +pub use edge::Edge; +pub use u256::U256; diff --git a/src/u256.rs b/src/types/u256.rs similarity index 100% rename from src/u256.rs rename to src/types/u256.rs