refactor: reorg into Cargo workspace (#55)

* refactor: reorg into Cargo workspace The goal is to prepare for the addition of the TAP aggregator. The current TAP library code is moved to lib/, and we'll be able to add more targets such as aggregator/. Signed-off-by: Alexis Asseman <alexis@semiotic.ai> * refactor: rename lib/ and package to tap_core/ Signed-off-by: Alexis Asseman <alexis@semiotic.ai> --------- Signed-off-by: Alexis Asseman <alexis@semiotic.ai>
semiotic-ai · Apr 24, 2023 · aa6ea9e · aa6ea9e
1 parent aabfe1d
commit aa6ea9e
Show file tree

Hide file tree

Showing 26 changed files with 38 additions and 29 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,31 +1,9 @@
-[package]
-name="timeline_aggregation_protocol"
+[workspace]
+members = [
+    "tap_core"
+]
+
+[workspace.package]
 version="0.1.0"
 edition = "2021"
 license = "Apache-2.0"
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-[dependencies]
-
-primitive-types={version="0.12.1", features=["serde"]}
-k256={version="0.13.0", features=["ecdsa", "serde"]}
-rand_core="0.6.4"
-serde={ version="1.0", features=["derive"] }
-rand="0.8.5"
-thiserror="1.0.38"
-ethereum-types={version="0.14.1"}
-rstest = "0.16.0"
-ethers = "2.0.0"
-ethers-core = "2.0.0"
-ethers-contract = "2.0.0"
-ethers-contract-derive = "2.0.0"
-criterion = "0.4.0"
-strum = "0.24.1"
-strum_macros = "0.24.3"
-tiny-keccak = { version = "2.0.2", default-features = false }
-
-
-[[bench]]
-name = 'timeline_aggretion_protocol_benchmark'
-harness = false
diff --git a/tap_core/Cargo.toml b/tap_core/Cargo.toml
@@ -0,0 +1,31 @@
+[package]
+name="tap_core"
+version.workspace = true
+edition.workspace = true
+license.workspace = true
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+
+primitive-types={version="0.12.1", features=["serde"]}
+k256={version="0.13.0", features=["ecdsa", "serde"]}
+rand_core="0.6.4"
+serde={ version="1.0", features=["derive"] }
+rand="0.8.5"
+thiserror="1.0.38"
+ethereum-types={version="0.14.1"}
+rstest = "0.16.0"
+ethers = "2.0.0"
+ethers-core = "2.0.0"
+ethers-contract = "2.0.0"
+ethers-contract-derive = "2.0.0"
+criterion = "0.4.0"
+strum = "0.24.1"
+strum_macros = "0.24.3"
+tiny-keccak = { version = "2.0.2", default-features = false }
+
+
+[[bench]]
+name = 'timeline_aggretion_protocol_benchmark'
+harness = false
diff --git a/.../timeline_aggretion_protocol_benchmark.rs → .../timeline_aggretion_protocol_benchmark.rs b/.../timeline_aggretion_protocol_benchmark.rs → .../timeline_aggretion_protocol_benchmark.rs
@@ -13,7 +13,7 @@ use ethereum_types::Address;
 use k256::ecdsa::{SigningKey, VerifyingKey};
 use rand_core::OsRng;
 use std::str::FromStr;
-use timeline_aggregation_protocol::{
+use tap_core::{
     eip_712_signed_message::EIP712SignedMessage,
     receipt_aggregate_voucher::ReceiptAggregateVoucher, tap_receipt::Receipt,
 };

diff --git a/src/adapters/allocation_adapter.rs → tap_core/src/adapters/allocation_adapter.rs b/src/adapters/allocation_adapter.rs → tap_core/src/adapters/allocation_adapter.rs
diff --git a/src/adapters/collateral_adapter.rs → tap_core/src/adapters/collateral_adapter.rs b/src/adapters/collateral_adapter.rs → tap_core/src/adapters/collateral_adapter.rs
diff --git a/src/adapters/mod.rs → tap_core/src/adapters/mod.rs b/src/adapters/mod.rs → tap_core/src/adapters/mod.rs
diff --git a/src/adapters/rav_storage_adapter.rs → tap_core/src/adapters/rav_storage_adapter.rs b/src/adapters/rav_storage_adapter.rs → tap_core/src/adapters/rav_storage_adapter.rs
diff --git a/src/adapters/receipt_adapter.rs → tap_core/src/adapters/receipt_adapter.rs b/src/adapters/receipt_adapter.rs → tap_core/src/adapters/receipt_adapter.rs
diff --git a/src/adapters/test/allocation_adapter_mock.rs → .../adapters/test/allocation_adapter_mock.rs b/src/adapters/test/allocation_adapter_mock.rs → .../adapters/test/allocation_adapter_mock.rs
diff --git a/src/adapters/test/allocation_adapter_test.rs → .../adapters/test/allocation_adapter_test.rs b/src/adapters/test/allocation_adapter_test.rs → .../adapters/test/allocation_adapter_test.rs
diff --git a/src/adapters/test/collateral_adapter_mock.rs → .../adapters/test/collateral_adapter_mock.rs b/src/adapters/test/collateral_adapter_mock.rs → .../adapters/test/collateral_adapter_mock.rs
diff --git a/src/adapters/test/collateral_adapter_test.rs → .../adapters/test/collateral_adapter_test.rs b/src/adapters/test/collateral_adapter_test.rs → .../adapters/test/collateral_adapter_test.rs
diff --git a/src/adapters/test/mod.rs → tap_core/src/adapters/test/mod.rs b/src/adapters/test/mod.rs → tap_core/src/adapters/test/mod.rs
diff --git a/...adapters/test/rav_storage_adapter_mock.rs → ...adapters/test/rav_storage_adapter_mock.rs b/...adapters/test/rav_storage_adapter_mock.rs → ...adapters/test/rav_storage_adapter_mock.rs
diff --git a/...adapters/test/rav_storage_adapter_test.rs → ...adapters/test/rav_storage_adapter_test.rs b/...adapters/test/rav_storage_adapter_test.rs → ...adapters/test/rav_storage_adapter_test.rs
diff --git a/src/adapters/test/receipt_adapter_mock.rs → ...src/adapters/test/receipt_adapter_mock.rs b/src/adapters/test/receipt_adapter_mock.rs → ...src/adapters/test/receipt_adapter_mock.rs
diff --git a/src/adapters/test/receipt_adapter_test.rs → ...src/adapters/test/receipt_adapter_test.rs b/src/adapters/test/receipt_adapter_test.rs → ...src/adapters/test/receipt_adapter_test.rs
diff --git a/src/eip_712_signed_message.rs → tap_core/src/eip_712_signed_message.rs b/src/eip_712_signed_message.rs → tap_core/src/eip_712_signed_message.rs
diff --git a/src/lib.rs → tap_core/src/lib.rs b/src/lib.rs → tap_core/src/lib.rs
diff --git a/src/receipt_aggregate_voucher.rs → tap_core/src/receipt_aggregate_voucher.rs b/src/receipt_aggregate_voucher.rs → tap_core/src/receipt_aggregate_voucher.rs
diff --git a/src/tap_receipt/mod.rs → tap_core/src/tap_receipt/mod.rs b/src/tap_receipt/mod.rs → tap_core/src/tap_receipt/mod.rs
diff --git a/src/tap_receipt/receipt.rs → tap_core/src/tap_receipt/receipt.rs b/src/tap_receipt/receipt.rs → tap_core/src/tap_receipt/receipt.rs
diff --git a/src/tap_receipt/received_receipt.rs → tap_core/src/tap_receipt/received_receipt.rs b/src/tap_receipt/received_receipt.rs → tap_core/src/tap_receipt/received_receipt.rs
diff --git a/src/tap_receipt/tests/mod.rs → tap_core/src/tap_receipt/tests/mod.rs b/src/tap_receipt/tests/mod.rs → tap_core/src/tap_receipt/tests/mod.rs
diff --git a/src/tap_receipt/tests/receipt_tests.rs → ...re/src/tap_receipt/tests/receipt_tests.rs b/src/tap_receipt/tests/receipt_tests.rs → ...re/src/tap_receipt/tests/receipt_tests.rs
diff --git a/...p_receipt/tests/received_receipt_tests.rs → ...p_receipt/tests/received_receipt_tests.rs b/...p_receipt/tests/received_receipt_tests.rs → ...p_receipt/tests/received_receipt_tests.rs