From 6289c7ee140d04d96bdbf86848b71c480b400d7c Mon Sep 17 00:00:00 2001 From: Brian Balser Date: Tue, 11 Apr 2023 09:03:04 -0400 Subject: [PATCH] light refactor on extract_reward_share --- reward_index/src/indexer.rs | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/reward_index/src/indexer.rs b/reward_index/src/indexer.rs index b9413d205..ebb02f7ec 100644 --- a/reward_index/src/indexer.rs +++ b/reward_index/src/indexer.rs @@ -136,24 +136,21 @@ impl Indexer { settings::Mode::Iot => { let share = IotRewardShare::decode(msg)?; match share.reward { - Some(IotReward::GatewayReward(r)) => { - let key = RewardKey { + Some(IotReward::GatewayReward(r)) => Ok(( + RewardKey { key: r.hotspot_key, reward_type: RewardType::IotGateway, - }; - Ok(( - key, - r.witness_amount + r.beacon_amount + r.dc_transfer_amount, - )) - } - Some(IotReward::OperationalReward(r)) => { - let key = RewardKey { + }, + r.witness_amount + r.beacon_amount + r.dc_transfer_amount, + )), + Some(IotReward::OperationalReward(r)) => Ok(( + RewardKey { key: self.op_fund_key.clone().to_vec(), reward_type: RewardType::IotOperational, - }; - Ok((key, r.amount)) - } - _ => bail!("got an invalid reward share"), + }, + r.amount, + )), + _ => bail!("got an invalid iot reward share"), } } }