diff --git a/ant-evm/src/data_payments.rs b/ant-evm/src/data_payments.rs index cc43f9598c..83241142cb 100644 --- a/ant-evm/src/data_payments.rs +++ b/ant-evm/src/data_payments.rs @@ -10,7 +10,6 @@ use crate::EvmError; use evmlib::{ common::{Address as RewardsAddress, QuoteHash}, quoting_metrics::QuotingMetrics, - utils::dummy_address, }; use libp2p::{identity::PublicKey, PeerId}; use serde::{Deserialize, Serialize}; @@ -135,18 +134,6 @@ pub struct PaymentQuote { } impl PaymentQuote { - /// create an empty PaymentQuote - pub fn zero() -> Self { - Self { - content: Default::default(), - timestamp: SystemTime::now(), - quoting_metrics: Default::default(), - rewards_address: dummy_address(), - pub_key: vec![], - signature: vec![], - } - } - pub fn hash(&self) -> QuoteHash { let mut bytes = self.bytes_for_sig(); bytes.extend_from_slice(self.pub_key.as_slice()); @@ -233,11 +220,23 @@ impl PaymentQuote { } /// test utility to create a dummy quote + #[cfg(test)] pub fn test_dummy(xorname: XorName) -> Self { + use evmlib::utils::dummy_address; + Self { content: xorname, timestamp: SystemTime::now(), - quoting_metrics: Default::default(), + quoting_metrics: QuotingMetrics { + data_size: 0, + data_type: 0, + close_records_stored: 0, + max_records: 0, + received_payment_count: 0, + live_time: 0, + network_density: None, + network_size: None, + }, pub_key: vec![], signature: vec![], rewards_address: dummy_address(), @@ -329,9 +328,9 @@ mod tests { #[test] fn test_is_newer_than() { - let old_quote = PaymentQuote::zero(); + let old_quote = PaymentQuote::test_dummy(Default::default()); sleep(Duration::from_millis(100)); - let new_quote = PaymentQuote::zero(); + let new_quote = PaymentQuote::test_dummy(Default::default()); assert!(new_quote.is_newer_than(&old_quote)); assert!(!old_quote.is_newer_than(&new_quote)); } @@ -343,7 +342,7 @@ mod tests { let false_peer = PeerId::random(); - let mut quote = PaymentQuote::zero(); + let mut quote = PaymentQuote::test_dummy(Default::default()); let bytes = quote.bytes_for_sig(); let signature = if let Ok(sig) = keypair.sign(&bytes) { sig @@ -374,9 +373,9 @@ mod tests { #[test] fn test_historical_verify() { - let mut old_quote = PaymentQuote::zero(); + let mut old_quote = PaymentQuote::test_dummy(Default::default()); sleep(Duration::from_millis(100)); - let mut new_quote = PaymentQuote::zero(); + let mut new_quote = PaymentQuote::test_dummy(Default::default()); // historical_verify will swap quotes to compare based on timeline automatically assert!(new_quote.historical_verify(&old_quote)); diff --git a/ant-networking/src/cmd.rs b/ant-networking/src/cmd.rs index b56febac14..3f7008bdf8 100644 --- a/ant-networking/src/cmd.rs +++ b/ant-networking/src/cmd.rs @@ -105,7 +105,7 @@ pub enum LocalSwarmCmd { key: RecordKey, data_type: u32, data_size: usize, - sender: oneshot::Sender<(QuotingMetrics, bool)>, + sender: oneshot::Sender>, }, /// Notify the node received a payment. PaymentReceived, @@ -593,7 +593,7 @@ impl SwarmDriver { ) = self.kbuckets_status(); let estimated_network_size = Self::estimate_network_size(peers_in_non_full_buckets, num_of_full_buckets); - let (quoting_metrics, is_already_stored) = self + let Some((quoting_metrics, is_already_stored)) = self .swarm .behaviour_mut() .kademlia @@ -603,7 +603,11 @@ impl SwarmDriver { data_type, data_size, Some(estimated_network_size as u64), - ); + ) + else { + let _res = sender.send(None); + return Ok(()); + }; self.record_metrics(Marker::QuotingMetrics { quoting_metrics: "ing_metrics, @@ -643,7 +647,7 @@ impl SwarmDriver { .retain(|peer_addr| key_address.distance(peer_addr) < boundary_distance); } - let _res = sender.send((quoting_metrics, is_already_stored)); + let _res = sender.send(Some((quoting_metrics, is_already_stored))); } LocalSwarmCmd::PaymentReceived => { cmd_string = "PaymentReceived"; diff --git a/ant-networking/src/lib.rs b/ant-networking/src/lib.rs index c3184156ed..568f599559 100644 --- a/ant-networking/src/lib.rs +++ b/ant-networking/src/lib.rs @@ -816,7 +816,7 @@ impl Network { key: RecordKey, data_type: u32, data_size: usize, - ) -> Result<(QuotingMetrics, bool)> { + ) -> Result> { let (sender, receiver) = oneshot::channel(); self.send_local_swarm_cmd(LocalSwarmCmd::GetLocalQuotingMetrics { key, diff --git a/ant-networking/src/record_store_api.rs b/ant-networking/src/record_store_api.rs index 755571800c..20228c2449 100644 --- a/ant-networking/src/record_store_api.rs +++ b/ant-networking/src/record_store_api.rs @@ -121,13 +121,15 @@ impl UnifiedRecordStore { data_type: u32, data_size: usize, network_size: Option, - ) -> (QuotingMetrics, bool) { + ) -> Option<(QuotingMetrics, bool)> { match self { Self::Client(_) => { warn!("Calling quoting metrics calculation at Client. This should not happen"); - Default::default() + None + } + Self::Node(store) => { + Some(store.quoting_metrics(key, data_type, data_size, network_size)) } - Self::Node(store) => store.quoting_metrics(key, data_type, data_size, network_size), } } diff --git a/ant-node/src/node.rs b/ant-node/src/node.rs index 81395821f4..9b7e4b8d26 100644 --- a/ant-node/src/node.rs +++ b/ant-node/src/node.rs @@ -601,7 +601,7 @@ impl Node { }; match maybe_quoting_metrics { - Ok((quoting_metrics, is_already_stored)) => { + Ok(Some((quoting_metrics, is_already_stored))) => { if is_already_stored { QueryResponse::GetStoreQuote { quote: Err(ProtocolError::RecordExists( @@ -623,6 +623,14 @@ impl Node { } } } + Ok(None) => { + error!("Quoting metrics not found for {key:?}. This might be because we are using a ClientRecordStore??. This should not happen"); + QueryResponse::GetStoreQuote { + quote: Err(ProtocolError::GetStoreQuoteFailed), + peer_address: NetworkAddress::from_peer(self_id), + storage_proofs, + } + } Err(err) => { warn!("GetStoreQuote failed for {key:?}: {err}"); QueryResponse::GetStoreQuote { diff --git a/evmlib/src/quoting_metrics.rs b/evmlib/src/quoting_metrics.rs index 187e5fd416..4042688a4b 100644 --- a/evmlib/src/quoting_metrics.rs +++ b/evmlib/src/quoting_metrics.rs @@ -32,29 +32,6 @@ pub struct QuotingMetrics { pub network_size: Option, } -impl QuotingMetrics { - /// construct an empty QuotingMetrics - pub fn new() -> Self { - Self { - // Default to be charged as a `Chunk` - data_type: 0, - data_size: 0, - close_records_stored: 0, - max_records: 0, - received_payment_count: 0, - live_time: 0, - network_density: None, - network_size: None, - } - } -} - -impl Default for QuotingMetrics { - fn default() -> Self { - Self::new() - } -} - impl Debug for QuotingMetrics { fn fmt(&self, formatter: &mut Formatter) -> FmtResult { let density_u256 = self.network_density.map(U256::from_be_bytes); diff --git a/evmlib/tests/payment_vault.rs b/evmlib/tests/payment_vault.rs index 8f30f6523a..88ef374348 100644 --- a/evmlib/tests/payment_vault.rs +++ b/evmlib/tests/payment_vault.rs @@ -122,7 +122,16 @@ async fn test_proxy_reachable_on_arb_sepolia() { let payment_vault = PaymentVaultHandler::new(*network.data_payments_address(), provider); let amount = payment_vault - .get_quote(vec![QuotingMetrics::default()]) + .get_quote(vec![QuotingMetrics { + data_size: 0, + data_type: 0, + close_records_stored: 0, + max_records: 0, + received_payment_count: 0, + live_time: 0, + network_density: None, + network_size: None, + }]) .await .unwrap(); @@ -209,7 +218,17 @@ async fn test_verify_payment_on_local() { let payment_verifications: Vec<_> = quote_payments .into_iter() .map(|v| interface::IPaymentVault::PaymentVerification { - metrics: QuotingMetrics::default().into(), + metrics: QuotingMetrics { + data_size: 0, + data_type: 0, + close_records_stored: 0, + max_records: 0, + received_payment_count: 0, + live_time: 0, + network_density: None, + network_size: None, + } + .into(), rewardsAddress: v.1, quoteHash: v.0, }) diff --git a/evmlib/tests/wallet.rs b/evmlib/tests/wallet.rs index e9e5f0a077..8122bda952 100644 --- a/evmlib/tests/wallet.rs +++ b/evmlib/tests/wallet.rs @@ -90,7 +90,20 @@ async fn test_pay_for_quotes_and_data_payment_verification() { let result = verify_data_payment( &network, vec![*quote_hash], - vec![(*quote_hash, QuotingMetrics::default(), *reward_addr)], + vec![( + *quote_hash, + QuotingMetrics { + data_size: 0, + data_type: 0, + close_records_stored: 0, + max_records: 0, + received_payment_count: 0, + live_time: 0, + network_density: None, + network_size: None, + }, + *reward_addr, + )], ) .await;