harmonize tokens genesis config with pallet_balances (#512)

Signed-off-by: Gregory Hill <[email protected]>

Author: gregdhill

authority/src/lib.rs

@@ -167,10 +167,6 @@ pub mod module {
 		FailedToSchedule,
 		/// Failed to cancel a task.
 		FailedToCancel,
-		/// Failed to fast track a task.
-		FailedToFastTrack,
-		/// Failed to delay a task.
-		FailedToDelay,
 	}
 
 	#[pallet::event]
@@ -285,8 +281,7 @@ pub mod module {
 			};
 
 			T::AuthorityConfig::check_fast_track_schedule(origin, &initial_origin, new_delay)?;
-			T::Scheduler::reschedule_named((&initial_origin, task_id).encode(), when)
-				.map_err(|_| Error::<T>::FailedToFastTrack)?;
+			T::Scheduler::reschedule_named((&initial_origin, task_id).encode(), when)?;
 
 			Self::deposit_event(Event::FastTracked(initial_origin, task_id, dispatch_at));
 			Ok(().into())
@@ -305,8 +300,7 @@ pub mod module {
 			T::Scheduler::reschedule_named(
 				(&initial_origin, task_id).encode(),
 				DispatchTime::After(additional_delay),
-			)
-			.map_err(|_| Error::<T>::FailedToDelay)?;
+			)?;
 
 			let now = frame_system::Pallet::<T>::block_number();
 			let dispatch_at = now.saturating_add(additional_delay);

currencies/src/mock.rs

@@ -167,7 +167,7 @@ impl ExtBuilder {
 		.unwrap();
 
 		orml_tokens::GenesisConfig::<Runtime> {
-			endowed_accounts: self
+			balances: self
 				.endowed_accounts
 				.into_iter()
 				.filter(|(_, currency_id, _)| *currency_id != NATIVE_CURRENCY_ID)

tokens/src/lib.rs

@@ -262,15 +262,13 @@ pub mod module {
 
 	#[pallet::genesis_config]
 	pub struct GenesisConfig<T: Config> {
-		pub endowed_accounts: Vec<(T::AccountId, T::CurrencyId, T::Balance)>,
+		pub balances: Vec<(T::AccountId, T::CurrencyId, T::Balance)>,
 	}
 
 	#[cfg(feature = "std")]
 	impl<T: Config> Default for GenesisConfig<T> {
 		fn default() -> Self {
-			GenesisConfig {
-				endowed_accounts: vec![],
-			}
+			GenesisConfig { balances: vec![] }
 		}
 	}
 
@@ -279,16 +277,16 @@ pub mod module {
 		fn build(&self) {
 			// ensure no duplicates exist.
 			let unique_endowed_accounts = self
-				.endowed_accounts
+				.balances
 				.iter()
 				.map(|(account_id, currency_id, _)| (account_id, currency_id))
 				.collect::<std::collections::BTreeSet<_>>();
 			assert!(
-				unique_endowed_accounts.len() == self.endowed_accounts.len(),
+				unique_endowed_accounts.len() == self.balances.len(),
 				"duplicate endowed accounts in genesis."
 			);
 
-			self.endowed_accounts
+			self.balances
 				.iter()
 				.for_each(|(account_id, currency_id, initial_balance)| {
 					assert!(

tokens/src/mock.rs

@@ -274,7 +274,7 @@ impl ExtBuilder {
 			.unwrap();
 
 		tokens::GenesisConfig::<Runtime> {
-			endowed_accounts: self.endowed_accounts,
+			balances: self.endowed_accounts,
 		}
 		.assimilate_storage(&mut t)
 		.unwrap();