diff --git a/pallets/stellar-relay/src/types.rs b/pallets/stellar-relay/src/types.rs index 18fdbe677..bea115475 100644 --- a/pallets/stellar-relay/src/types.rs +++ b/pallets/stellar-relay/src/types.rs @@ -1,12 +1,12 @@ -use frame_support::BoundedVec; use crate::{ traits::{Organization, Validator}, Config, }; +use frame_support::BoundedVec; pub type OrganizationIdOf = ::OrganizationId; pub type ValidatorOf = Validator>; pub type OrganizationOf = Organization>; pub type ValidatorsList = BoundedVec, ::ValidatorLimit>; -pub type OrganizationsList = BoundedVec, ::OrganizationLimit>; \ No newline at end of file +pub type OrganizationsList = BoundedVec, ::OrganizationLimit>; diff --git a/pallets/stellar-relay/src/validation.rs b/pallets/stellar-relay/src/validation.rs index 273ce7aaa..32b948b89 100644 --- a/pallets/stellar-relay/src/validation.rs +++ b/pallets/stellar-relay/src/validation.rs @@ -10,10 +10,10 @@ use primitives::stellar::{ use crate::{ pallet::{verify_signature, Config}, + types::{OrganizationsList, ValidatorOf, ValidatorsList}, Error, NewValidatorsEnactmentBlockHeight, OldOrganizations, OldValidators, Organizations, Pallet, Validators, }; -use crate::types::{OrganizationsList, ValidatorOf, ValidatorsList}; /// Returns a map of organizationID to the number of validators that belongs to it fn validator_count_per_org( @@ -189,13 +189,8 @@ pub fn find_externalized_envelope( .ok_or(Error::::MissingExternalizedMessage) } -pub fn validators_and_orgs() -> Result< - ( - ValidatorsList, - OrganizationsList, - ), - Error, -> { +pub fn validators_and_orgs( +) -> Result<(ValidatorsList, OrganizationsList), Error> { // Choose the set of validators to use for validation based on the enactment block // height and the current block number let should_use_new_validator_set =