diff --git a/mobile_verifier/src/rewarder.rs b/mobile_verifier/src/rewarder.rs index d20f864b4..cd655d182 100644 --- a/mobile_verifier/src/rewarder.rs +++ b/mobile_verifier/src/rewarder.rs @@ -313,7 +313,7 @@ where boosted_poc_bones_per_reward_share: Some(helium_proto::Decimal { value: poc_dc_shares.boost.to_string(), }), - sp_allocations: service_provider::reward_data_sp_allocations(&self.pool).await?, + // sp_allocations: service_provider::reward_data_sp_allocations(&self.pool).await?, }; self.reward_manifests .write( diff --git a/mobile_verifier/src/service_provider/promotions/rewards.rs b/mobile_verifier/src/service_provider/promotions/rewards.rs index 127febae5..644acf85a 100644 --- a/mobile_verifier/src/service_provider/promotions/rewards.rs +++ b/mobile_verifier/src/service_provider/promotions/rewards.rs @@ -2,11 +2,10 @@ use std::ops::Range; use chrono::{DateTime, Utc}; use file_store::promotion_reward::{Entity, PromotionReward}; -use futures::TryStreamExt; -use helium_crypto::PublicKeyBinary; + use mobile_config::client::{carrier_service_client::CarrierServiceVerifier, ClientError}; use rust_decimal::Decimal; -use sqlx::{postgres::PgRow, PgPool, Postgres, Row, Transaction}; +use sqlx::{PgPool, Postgres, Transaction}; use crate::service_provider::ServiceProviderId; @@ -95,52 +94,6 @@ pub async fn save_promotion_reward( Ok(()) } -pub async fn fetch_promotion_rewards( - pool: &PgPool, - carrier: &impl CarrierServiceVerifier, - epoch: &Range>, -) -> anyhow::Result { - let rewards = sqlx::query_as( - r#" - SELECT - subscriber_id, NULL as gateway_key, SUM(shares)::bigint as shares, carrier_key - FROM - subscriber_promotion_rewards - WHERE - time_of_reward >= $1 AND time_of_reward < $2 - GROUP BY - subscriber_id, carrier_key - UNION - SELECT - NULL as subscriber_id, gateway_key, SUM(shares)::bigint as shares, carrier_key - FROM - gateway_promotion_rewards - WHERE - time_of_reward >= $1 AND time_of_reward < $2 - GROUP - BY gateway_key, carrier_key - "#, - ) - .bind(epoch.start) - .bind(epoch.end) - .fetch(pool) - .map_err(anyhow::Error::from) - .and_then(|x: DbPromotionRewardShares| async move { - let service_provider_id = carrier - .payer_key_to_service_provider(&x.carrier_key.to_string()) - .await?; - Ok(PromotionRewardShare { - service_provider_id: service_provider_id as ServiceProviderId, - rewardable_entity: x.rewardable_entity, - shares: x.shares, - }) - }) - .try_collect() - .await?; - - Ok(ServiceProviderPromotions(rewards)) -} - pub async fn clear_promotion_rewards( tx: &mut Transaction<'_, Postgres>, timestamp: &DateTime, @@ -204,24 +157,24 @@ pub async fn fetch_promotion_rewards( // Ok(ServiceProviderPromotions(rewards)) } -struct DbPromotionRewardShares { - pub carrier_key: PublicKeyBinary, - pub rewardable_entity: Entity, - pub shares: u64, -} - -impl sqlx::FromRow<'_, PgRow> for DbPromotionRewardShares { - fn from_row(row: &PgRow) -> sqlx::Result { - let subscriber_id: Option> = row.try_get("subscriber_id")?; - let shares: i64 = row.try_get("shares")?; - Ok(Self { - rewardable_entity: if let Some(subscriber_id) = subscriber_id { - Entity::SubscriberId(subscriber_id) - } else { - Entity::GatewayKey(row.try_get("gateway_key")?) - }, - shares: shares as u64, - carrier_key: row.try_get("carrier_key")?, - }) - } -} +// struct DbPromotionRewardShares { +// pub carrier_key: PublicKeyBinary, +// pub rewardable_entity: Entity, +// pub shares: u64, +// } + +// impl sqlx::FromRow<'_, PgRow> for DbPromotionRewardShares { +// fn from_row(row: &PgRow) -> sqlx::Result { +// let subscriber_id: Option> = row.try_get("subscriber_id")?; +// let shares: i64 = row.try_get("shares")?; +// Ok(Self { +// rewardable_entity: if let Some(subscriber_id) = subscriber_id { +// Entity::SubscriberId(subscriber_id) +// } else { +// Entity::GatewayKey(row.try_get("gateway_key")?) +// }, +// shares: shares as u64, +// carrier_key: row.try_get("carrier_key")?, +// }) +// } +// } diff --git a/mobile_verifier/src/service_provider/reward.rs b/mobile_verifier/src/service_provider/reward.rs index e9e40435f..9a12a8bf4 100644 --- a/mobile_verifier/src/service_provider/reward.rs +++ b/mobile_verifier/src/service_provider/reward.rs @@ -423,7 +423,6 @@ mod tests { let sp_2 = sp_infos.single_sp_rewards(1); assert_eq!(sp_2.amount, 0); - // let (promo_1, sp_1) = sp_infos.single_sp_rewards(0); // assert_eq!(promo_1.service_provider_amount, 6); @@ -626,8 +625,6 @@ mod tests { // assert_eq!(promo_rewards[1].matched_amount, 6); // } - - // trait PromoRewardFiltersExt { // fn only_promotion_rewards(&self) -> Vec; // }