HIP 148 (#1064)

* return 10% of mapping rewards to service provider rewards pool

* Remove mapper rewards and move 10% to data transfer bucket

* Remove oracles reward bucket and move to service provider bucket

* Change service provider rewarder to be flat 24% and remove promotions support

* Change as to .into

Author: bbalser

mobile_verifier/src/cli/mod.rs

@@ -1,4 +1,3 @@
 pub mod reward_from_db;
 pub mod server;
-pub mod service_provider_promotions;
 pub mod verify_disktree;

mobile_verifier/src/cli/server.rs

@@ -9,7 +9,6 @@ use crate::{
     heartbeats::wifi::WifiHeartbeatDaemon,
     rewarder::Rewarder,
     speedtests::SpeedtestDaemon,
-    subscriber_mapping_activity::SubscriberMappingActivityDaemon,
     telemetry,
     unique_connections::ingestor::UniqueConnectionsIngestor,
     Settings,
@@ -19,8 +18,8 @@ use file_store::file_upload;
 use file_store_oracles::traits::{FileSinkCommitStrategy, FileSinkRollTime, FileSinkWriteExt};
 use helium_proto::services::poc_mobile::{Heartbeat, SeniorityUpdate, SpeedtestAvg};
 use mobile_config::client::{
-    entity_client::EntityClient, hex_boosting_client::HexBoostingClient,
-    sub_dao_client::SubDaoClient, AuthorizationClient, CarrierServiceClient, GatewayClient,
+    hex_boosting_client::HexBoostingClient, sub_dao_client::SubDaoClient, AuthorizationClient,
+    GatewayClient,
 };
 use task_manager::TaskManager;
 
@@ -43,8 +42,6 @@ impl Cmd {
         // mobile config clients
         let gateway_client = GatewayClient::from_settings(&settings.config_client)?;
         let auth_client = AuthorizationClient::from_settings(&settings.config_client)?;
-        let entity_client = EntityClient::from_settings(&settings.config_client)?;
-        let carrier_client = CarrierServiceClient::from_settings(&settings.config_client)?;
         let hex_boosting_client = HexBoostingClient::from_settings(&settings.config_client)?;
         let sub_dao_rewards_client = SubDaoClient::from_settings(&settings.config_client)?;
 
@@ -120,17 +117,6 @@ impl Cmd {
                 )
                 .await?,
             )
-            .add_task(
-                SubscriberMappingActivityDaemon::create_managed_task(
-                    pool.clone(),
-                    settings,
-                    auth_client.clone(),
-                    entity_client.clone(),
-                    ingest_bucket_client.clone(),
-                    file_upload.clone(),
-                )
-                .await?,
-            )
             .add_task(
                 CoverageDaemon::create_managed_task(
                     pool.clone(),
@@ -186,7 +172,6 @@ impl Cmd {
                     pool,
                     settings,
                     file_upload,
-                    carrier_client,
                     hex_boosting_client,
                     sub_dao_rewards_client,
                     speedtests_avg,

mobile_verifier/src/cli/service_provider_promotions.rs

@@ -15,7 +15,6 @@ pub mod service_provider;
 mod settings;
 pub mod speedtests;
 pub mod speedtests_average;
-pub mod subscriber_mapping_activity;
 pub mod telemetry;
 pub mod unique_connections;
 

mobile_verifier/src/lib.rs

@@ -1,7 +1,7 @@
 use anyhow::Result;
 use clap::Parser;
 use mobile_verifier::{
-    cli::{reward_from_db, server, service_provider_promotions, verify_disktree},
+    cli::{reward_from_db, server, verify_disktree},
     Settings,
 };
 use std::path;
@@ -38,8 +38,6 @@ pub enum Cmd {
     /// Go through every cell and ensure it's value can be turned into an Assignment.
     /// NOTE: This can take a very long time. Run with a --release binary.
     VerifyDisktree(verify_disktree::Cmd),
-    /// Print active Service Provider Promotions
-    ServiceProviderPromotions(service_provider_promotions::Cmd),
 }
 
 impl Cmd {
@@ -48,7 +46,6 @@ impl Cmd {
             Self::Server(cmd) => cmd.run(&settings).await,
             Self::RewardFromDb(cmd) => cmd.run(&settings).await,
             Self::VerifyDisktree(cmd) => cmd.run(&settings).await,
-            Self::ServiceProviderPromotions(cmd) => cmd.run(&settings).await,
         }
     }
 }