Remove explicit mailbox dependency

gear-tech · Dec 13, 2023 · 0e355c4 · 0e355c4
1 parent 9baedba
commit 0e355c4
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 13 deletions.
diff --git a/pallets/gear-voucher/src/lib.rs b/pallets/gear-voucher/src/lib.rs
@@ -211,7 +211,8 @@ pub mod pallet {
                 PrepaidCall::SendMessage { destination, .. } => {
                     Some(Self::voucher_id(who, destination))
                 }
-                PrepaidCall::SendReply { .. } => todo!("TODO (breathx): extract mailbox here"),
+                PrepaidCall::SendReply { reply_to_id, .. } => T::Mailbox::peek(who, reply_to_id)
+                    .map(|stored_message| Self::voucher_id(who, &stored_message.source())),
             }
         }
     }

diff --git a/pallets/payment/src/mock.rs b/pallets/payment/src/mock.rs
@@ -164,10 +164,9 @@ impl DelegateFee<RuntimeCall, AccountId> for DelegateFeeAccountBuilder {
             RuntimeCall::GearVoucher(pallet_gear_voucher::Call::call {
                 call: pallet_gear_voucher::PrepaidCall::SendMessage { .. },
             }) => Some(FEE_PAYER),
-            RuntimeCall::GearVoucher(pallet_gear_voucher::Call::call {
-                call: pallet_gear_voucher::PrepaidCall::SendReply { reply_to_id, .. },
-            }) => <MailboxOf<Test> as common::storage::Mailbox>::peek(who, reply_to_id)
-                .map(|stored_message| GearVoucher::voucher_id(who, &stored_message.source())),
+            RuntimeCall::GearVoucher(pallet_gear_voucher::Call::call { call }) => {
+                GearVoucher::sponsor_of(who, call)
+            }
             _ => None,
         }
     }

diff --git a/runtime/vara/src/lib.rs b/runtime/vara/src/lib.rs
@@ -24,7 +24,7 @@
 #[cfg(all(feature = "std", not(feature = "fuzz")))]
 include!(concat!(env!("OUT_DIR"), "/wasm_binary.rs"));
 
-use common::storage::{Mailbox, Messenger};
+use common::storage::Messenger;
 use frame_election_provider_support::{
     onchain, ElectionDataProvider, NposSolution, SequentialPhragmen, VoteWeight,
 };
@@ -1057,13 +1057,9 @@ pub struct DelegateFeeAccountBuilder;
 impl DelegateFee<RuntimeCall, AccountId> for DelegateFeeAccountBuilder {
     fn delegate_fee(call: &RuntimeCall, who: &AccountId) -> Option<AccountId> {
         match call {
-            RuntimeCall::GearVoucher(pallet_gear_voucher::Call::call {
-                call: pallet_gear_voucher::PrepaidCall::SendMessage { destination, .. },
-            }) => Some(GearVoucher::voucher_id(who, destination)),
-            RuntimeCall::GearVoucher(pallet_gear_voucher::Call::call {
-                call: pallet_gear_voucher::PrepaidCall::SendReply { reply_to_id, .. },
-            }) => <<GearMessenger as Messenger>::Mailbox as Mailbox>::peek(who, reply_to_id)
-                .map(|stored_message| GearVoucher::voucher_id(who, &stored_message.source())),
+            RuntimeCall::GearVoucher(pallet_gear_voucher::Call::call { call }) => {
+                GearVoucher::sponsor_of(who, call)
+            }
             _ => None,
         }
     }