Merge pull request #216 from semiotic-ai/gusinacio/new-project-structure

Refactor: new project structure
semiotic-ai · Mar 11, 2024 · 2a0bf49 · 2a0bf49
2 parents 59154df + 351cf45
commit 2a0bf49
Show file tree

Hide file tree

Showing 35 changed files with 853 additions and 1,090 deletions.
diff --git a/tap_aggregator/src/aggregator.rs b/tap_aggregator/src/aggregator.rs
@@ -10,8 +10,7 @@ use ethers_core::types::Signature;
 use ethers_signers::LocalWallet;
 
 use tap_core::{
-    eip_712_signed_message::EIP712SignedMessage,
-    receipt_aggregate_voucher::ReceiptAggregateVoucher, tap_receipt::Receipt,
+    rav::ReceiptAggregateVoucher, receipt::Receipt, signed_message::EIP712SignedMessage,
 };
 
 pub fn check_and_aggregate_receipts(
@@ -140,9 +139,7 @@ mod tests {
     use rstest::*;
 
     use crate::aggregator;
-    use tap_core::{
-        eip_712_signed_message::EIP712SignedMessage, tap_eip712_domain, tap_receipt::Receipt,
-    };
+    use tap_core::{receipt::Receipt, signed_message::EIP712SignedMessage, tap_eip712_domain};
 
     #[fixture]
     fn keys() -> (LocalWallet, Address) {
@@ -248,7 +245,7 @@ mod tests {
         // Create rav with max_timestamp below the receipts timestamps
         let rav = EIP712SignedMessage::new(
             &domain_separator,
-            tap_core::receipt_aggregate_voucher::ReceiptAggregateVoucher {
+            tap_core::rav::ReceiptAggregateVoucher {
                 allocationId: allocation_ids[0],
                 timestampNs: receipt_timestamp_range.clone().min().unwrap() - 1,
                 valueAggregate: 42,
@@ -262,7 +259,7 @@ mod tests {
         // Aggregation should fail
         let rav = EIP712SignedMessage::new(
             &domain_separator,
-            tap_core::receipt_aggregate_voucher::ReceiptAggregateVoucher {
+            tap_core::rav::ReceiptAggregateVoucher {
                 allocationId: allocation_ids[0],
                 timestampNs: receipt_timestamp_range.clone().min().unwrap(),
                 valueAggregate: 42,
@@ -276,7 +273,7 @@ mod tests {
         // Aggregation should fail
         let rav = EIP712SignedMessage::new(
             &domain_separator,
-            tap_core::receipt_aggregate_voucher::ReceiptAggregateVoucher {
+            tap_core::rav::ReceiptAggregateVoucher {
                 allocationId: allocation_ids[0],
                 timestampNs: receipt_timestamp_range.clone().max().unwrap() + 1,
                 valueAggregate: 42,

diff --git a/tap_aggregator/src/server.rs b/tap_aggregator/src/server.rs
@@ -19,8 +19,7 @@ use crate::api_versioning::{
 use crate::error_codes::{JsonRpcErrorCode, JsonRpcWarningCode};
 use crate::jsonrpsee_helpers::{JsonRpcError, JsonRpcResponse, JsonRpcResult, JsonRpcWarning};
 use tap_core::{
-    eip_712_signed_message::EIP712SignedMessage,
-    receipt_aggregate_voucher::ReceiptAggregateVoucher, tap_receipt::Receipt,
+    rav::ReceiptAggregateVoucher, receipt::Receipt, signed_message::EIP712SignedMessage,
 };
 
 // Register the metrics into the global metrics registry.
@@ -254,9 +253,8 @@ mod tests {
 
     use crate::server;
     use tap_core::{
-        eip_712_signed_message::EIP712SignedMessage,
-        receipt_aggregate_voucher::ReceiptAggregateVoucher, tap_eip712_domain,
-        tap_receipt::Receipt,
+        rav::ReceiptAggregateVoucher, receipt::Receipt, signed_message::EIP712SignedMessage,
+        tap_eip712_domain,
     };
 
     #[derive(Clone)]

diff --git a/tap_core/Cargo.toml b/tap_core/Cargo.toml
@@ -30,8 +30,8 @@ criterion = { version = "0.5", features = ["async_std"] }
 
 
 [features]
-default = ["mock"]
-mock = []
+default = ["in_memory"]
+in_memory = []
 
 [[bench]]
 name = 'timeline_aggretion_protocol_benchmark'

diff --git a/tap_core/benches/timeline_aggretion_protocol_benchmark.rs b/tap_core/benches/timeline_aggretion_protocol_benchmark.rs
@@ -18,8 +18,7 @@ use ethers_core::k256::ecdsa::SigningKey;
 use rand_core::OsRng;
 use tap_core::tap_eip712_domain;
 use tap_core::{
-    eip_712_signed_message::EIP712SignedMessage,
-    receipt_aggregate_voucher::ReceiptAggregateVoucher, tap_receipt::Receipt,
+    rav::ReceiptAggregateVoucher, receipt::Receipt, signed_message::EIP712SignedMessage,
 };
 
 pub fn create_and_sign_receipt(

diff --git a/tap_core/src/adapters/test/escrow_adapter_test.rs b/tap_core/src/adapters/test/escrow_adapter_test.rs
diff --git a/tap_core/src/adapters/test/mod.rs b/tap_core/src/adapters/test/mod.rs
diff --git a/tap_core/src/adapters/test/rav_storage_adapter_test.rs b/tap_core/src/adapters/test/rav_storage_adapter_test.rs