chore: rename SignedRAV to SignedRav

Signed-off-by: Gustavo Inacio <[email protected]>

Author: gusinacio

tap_aggregator/src/grpc.rs

@@ -114,7 +114,7 @@ impl From<u128> for Uint128 {
 impl RavRequest {
     pub fn new(
         receipts: Vec<tap_core::receipt::SignedReceipt>,
-        previous_rav: Option<tap_core::rav::SignedRAV>,
+        previous_rav: Option<tap_core::rav::SignedRav>,
     ) -> Self {
         Self {
             receipts: receipts.into_iter().map(Into::into).collect(),
@@ -124,8 +124,8 @@ impl RavRequest {
 }
 
 impl RavResponse {
-    pub fn signed_rav(mut self) -> anyhow::Result<tap_core::rav::SignedRAV> {
-        let signed_rav: tap_core::rav::SignedRAV = self
+    pub fn signed_rav(mut self) -> anyhow::Result<tap_core::rav::SignedRav> {
+        let signed_rav: tap_core::rav::SignedRav = self
             .rav
             .take()
             .ok_or(anyhow!("Couldn't find rav"))?

tap_aggregator/tests/aggregate_test.rs

@@ -64,11 +64,11 @@ async fn aggregation_test() {
 
     let rav_request = RavRequest::new(receipts.clone(), None);
     let res = client.aggregate_receipts(rav_request).await.unwrap();
-    let signed_rav: tap_core::rav::SignedRAV = res.into_inner().signed_rav().unwrap();
+    let signed_rav: tap_core::rav::SignedRav = res.into_inner().signed_rav().unwrap();
 
     let sender_aggregator = HttpClientBuilder::default().build(&endpoint).unwrap();
 
-    let previous_rav: Option<tap_core::rav::SignedRAV> = None;
+    let previous_rav: Option<tap_core::rav::SignedRav> = None;
 
     let response: JsonRpcResponse<EIP712SignedMessage<ReceiptAggregateVoucher>> = sender_aggregator
         .request(

tap_core/src/manager/context/memory.rs

@@ -17,15 +17,15 @@ use async_trait::async_trait;
 
 use crate::{
     manager::adapters::*,
-    rav::{ReceiptAggregateVoucher, SignedRAV},
+    rav::{ReceiptAggregateVoucher, SignedRav},
     receipt::{checks::StatefulTimestampCheck, state::Checking, ReceiptWithState, SignedReceipt},
     signed_message::MessageId,
 };
 
 pub type EscrowStorage = Arc<RwLock<HashMap<Address, u128>>>;
 pub type QueryAppraisals = Arc<RwLock<HashMap<MessageId, u128>>>;
 pub type ReceiptStorage = Arc<RwLock<HashMap<u64, ReceiptWithState<Checking, SignedReceipt>>>>;
-pub type RAVStorage = Arc<RwLock<Option<SignedRAV>>>;
+pub type RAVStorage = Arc<RwLock<Option<SignedRav>>>;
 
 use thiserror::Error;
 
@@ -128,7 +128,7 @@ impl InMemoryContext {
 impl RavStore<ReceiptAggregateVoucher> for InMemoryContext {
     type AdapterError = InMemoryError;
 
-    async fn update_last_rav(&self, rav: SignedRAV) -> Result<(), Self::AdapterError> {
+    async fn update_last_rav(&self, rav: SignedRav) -> Result<(), Self::AdapterError> {
         let mut rav_storage = self.rav_storage.write().unwrap();
         let timestamp = rav.message.timestampNs;
         *rav_storage = Some(rav);
@@ -141,7 +141,7 @@ impl RavStore<ReceiptAggregateVoucher> for InMemoryContext {
 impl RavRead<ReceiptAggregateVoucher> for InMemoryContext {
     type AdapterError = InMemoryError;
 
-    async fn last_rav(&self) -> Result<Option<SignedRAV>, Self::AdapterError> {
+    async fn last_rav(&self) -> Result<Option<SignedRav>, Self::AdapterError> {
         Ok(self.rav_storage.read().unwrap().clone())
     }
 }

tap_core/src/rav.rs

@@ -51,7 +51,7 @@ use crate::{
 };
 
 /// EIP712 signed message for ReceiptAggregateVoucher
-pub type SignedRAV = EIP712SignedMessage<ReceiptAggregateVoucher>;
+pub type SignedRav = EIP712SignedMessage<ReceiptAggregateVoucher>;
 pub use request::RavRequest;
 
 pub trait Aggregate<T>: SolStruct {

tap_integration_tests/tests/indexer_mock.rs

@@ -21,7 +21,7 @@ use tap_core::{
         adapters::{RavRead, RavStore, ReceiptRead, ReceiptStore, SignatureChecker},
         Manager,
     },
-    rav::{ReceiptAggregateVoucher, SignedRAV},
+    rav::{ReceiptAggregateVoucher, SignedRav},
     receipt::{checks::CheckList, Context, SignedReceipt},
 };
 /// Rpc trait represents a JSON-RPC server that has a single async method `request`.
@@ -212,7 +212,7 @@ where
     );
 
     // Call the aggregate_receipts method on the other server
-    let remote_rav_result: jsonrpsee_helpers::JsonRpcResponse<SignedRAV> = aggregator_client
+    let remote_rav_result: jsonrpsee_helpers::JsonRpcResponse<SignedRav> = aggregator_client
         .0
         .request("aggregate_receipts", params)
         .await?;

tap_integration_tests/tests/showcase.rs

@@ -26,7 +26,7 @@ use rstest::*;
 use tap_aggregator::{jsonrpsee_helpers, server as agg_server};
 use tap_core::{
     manager::context::memory::{checks::get_full_list_of_checks, *},
-    rav::SignedRAV,
+    rav::SignedRav,
     receipt::{
         checks::{CheckList, StatefulTimestampCheck},
         Receipt, SignedReceipt,
@@ -722,7 +722,7 @@ async fn test_tap_aggregator_rav_timestamp_cuttoff(
     let second_batch = &requests[receipt_threshold_1 as usize..2 * receipt_threshold_1 as usize];
 
     let params = rpc_params!(&aggregate_server_api_version(), &first_batch, None::<()>);
-    let first_rav_response: jsonrpsee_helpers::JsonRpcResponse<SignedRAV> =
+    let first_rav_response: jsonrpsee_helpers::JsonRpcResponse<SignedRav> =
         client.request("aggregate_receipts", params).await?;
 
     let params = rpc_params!(
@@ -731,7 +731,7 @@ async fn test_tap_aggregator_rav_timestamp_cuttoff(
         first_rav_response.data
     );
     let second_rav_response: Result<
-        jsonrpsee_helpers::JsonRpcResponse<SignedRAV>,
+        jsonrpsee_helpers::JsonRpcResponse<SignedRav>,
         jsonrpsee::core::ClientError,
     > = client.request("aggregate_receipts", params).await;
     assert!(
@@ -747,15 +747,15 @@ async fn test_tap_aggregator_rav_timestamp_cuttoff(
     let second_batch = &requests[receipt_threshold_1 as usize..2 * receipt_threshold_1 as usize];
 
     let params = rpc_params!(&aggregate_server_api_version(), &first_batch, None::<()>);
-    let first_rav_response: jsonrpsee_helpers::JsonRpcResponse<SignedRAV> =
+    let first_rav_response: jsonrpsee_helpers::JsonRpcResponse<SignedRav> =
         client.request("aggregate_receipts", params).await?;
 
     let params = rpc_params!(
         &aggregate_server_api_version(),
         &second_batch,
         first_rav_response.data
     );
-    let second_rav_response: jsonrpsee_helpers::JsonRpcResponse<SignedRAV> =
+    let second_rav_response: jsonrpsee_helpers::JsonRpcResponse<SignedRav> =
         client.request("aggregate_receipts", params).await?;
 
     // Compute the expected aggregate value and check that it matches the latest RAV.