@@ -213,27 +213,17 @@ where
213
213
) -> EvmResult < Vec < BitcoinAddressString > > {
214
214
handle. record_cost ( RuntimeHelper :: < Runtime > :: db_read_gas_cost ( ) ) ?;
215
215
216
- let target_round = Self :: target_round ( pool_round) ;
217
- let mut vault_addresses: Vec < BitcoinAddressString > =
218
- pallet_btc_registration_pool:: RegistrationPool :: < Runtime > :: iter_prefix ( target_round)
219
- . filter_map ( |( _, relay_target) | match relay_target. vault . address {
220
- AddressState :: Pending => None ,
221
- AddressState :: Generated ( address) => {
222
- Some ( BitcoinAddressString :: from ( address. into_inner ( ) ) )
223
- } ,
224
- } )
225
- . collect ( ) ;
226
- // add system vault if it exists
227
- if let Some ( system_vault) =
228
- pallet_btc_registration_pool:: SystemVault :: < Runtime > :: get ( target_round)
229
- {
230
- match system_vault. address {
231
- AddressState :: Pending => ( ) ,
216
+ let vault_addresses: Vec < BitcoinAddressString > =
217
+ pallet_btc_registration_pool:: RegistrationPool :: < Runtime > :: iter_prefix (
218
+ Self :: target_round ( pool_round) ,
219
+ )
220
+ . filter_map ( |( _, relay_target) | match relay_target. vault . address {
221
+ AddressState :: Pending => None ,
232
222
AddressState :: Generated ( address) => {
233
- vault_addresses . push ( BitcoinAddressString :: from ( address. into_inner ( ) ) ) ;
223
+ Some ( BitcoinAddressString :: from ( address. into_inner ( ) ) )
234
224
} ,
235
- }
236
- }
225
+ } )
226
+ . collect ( ) ;
237
227
238
228
Ok ( vault_addresses)
239
229
}
0 commit comments