Merge pull request #561 from helium/jg/encoding-subscriber-id-rewards

ensure mobile subscriber id is properly credited for mobile rewards
helium · Jun 30, 2023 · c4cc3ce · c4cc3ce
2 parents 0f5d3f2 + d9b9c29
commit c4cc3ce
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 13 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/reward_index/Cargo.toml b/reward_index/Cargo.toml
@@ -9,6 +9,7 @@ license.workspace = true
 
 [dependencies]
 anyhow = {workspace = true}
+bs58 = {workspace = true}
 config = {workspace = true}
 clap = {workspace = true}
 thiserror = {workspace = true}

diff --git a/reward_index/src/indexer.rs b/reward_index/src/indexer.rs
@@ -146,19 +146,13 @@ impl Indexer {
                         },
                         r.dc_transfer_reward,
                     )),
-                    Some(MobileReward::SubscriberReward(r)) => {
-                        let key = match str::from_utf8(&r.subscriber_id) {
-                            Ok(k) => k.to_string(),
-                            Err(_e) => bail!("got an invalid subscriber id"),
-                        };
-                        Ok((
-                            RewardKey {
-                                key,
-                                reward_type: RewardType::MobileSubscriber,
-                            },
-                            r.discovery_location_amount,
-                        ))
-                    }
+                    Some(MobileReward::SubscriberReward(r)) => Ok((
+                        RewardKey {
+                            key: bs58::encode(&r.subscriber_id).into_string(),
+                            reward_type: RewardType::MobileSubscriber,
+                        },
+                        r.discovery_location_amount,
+                    )),
                     _ => bail!("got an invalid reward share"),
                 }
             }