Remove duplicated code.

demo/runtime/src/runtime/staking.rs

@@ -217,120 +217,6 @@ impl privileged::Dispatch for democracy::PrivPass {
 	}
 }
 
-pub struct PublicPass<'a> (&'a AccountId);
-
-const NOBODY: AccountId = [0u8; 32];
-
-impl<'a> PublicPass<'a> {
-	pub fn new(transactor: &AccountId) -> PublicPass {
-		let b = free_balance(&transactor);
-		let transaction_fee = transaction_fee();
-		assert!(b >= transaction_fee, "attempt to transact without enough funds to pay fee");
-		internal::set_free_balance(&transactor, b - transaction_fee);
-		PublicPass(transactor)
-	}
-
-	#[cfg(test)]
-	pub fn test(signed: &AccountId) -> PublicPass {
-		PublicPass(signed)
-	}
-
-	#[cfg(test)]
-	pub fn nobody() -> PublicPass<'static> {
-		PublicPass(&NOBODY)
-	}
-
-	/// Create a smart-contract account.
-	pub fn create(self, code: &[u8], value: Balance) {
-		// commit anything that made it this far to storage
-		if let Some(commit) = private::effect_create(self.0, code, value, private::DirectExt) {
-			private::commit_state(commit);
-		}
-	}
-}
-
-impl<'a> ops::Deref for PublicPass<'a> {
-	type Target = AccountId;
-	fn deref(&self) -> &AccountId {
-		self.0
-	}
-}
-
-impl_dispatch! {
-	pub mod public;
-	fn transfer(dest: AccountId, value: Balance) = 0;
-	fn stake() = 1;
-	fn unstake() = 2;
-}
-
-impl<'a> public::Dispatch for PublicPass<'a> {
-	/// Transfer some unlocked staking balance to another staker.
-	/// TODO: probably want to state gas-limit and gas-price.
-	fn transfer(self, dest: AccountId, value: Balance) {
-		// commit anything that made it this far to storage
-		if let Some(commit) = private::effect_transfer(&self, &dest, value, private::DirectExt) {
-			private::commit_state(commit);
-		}
-	}
-
-	/// Declare the desire to stake for the transactor.
-	///
-	/// Effects will be felt at the beginning of the next era.
-	fn stake(self) {
-		let mut intentions = IntentionStorageVec::items();
-		// can't be in the list twice.
-		assert!(intentions.iter().find(|&t| *t == *self).is_none(), "Cannot stake if already staked.");
-		intentions.push(self.clone());
-		IntentionStorageVec::set_items(&intentions);
-		storage::put(&self.to_keyed_vec(BONDAGE_OF), &u64::max_value());
-	}
-
-	/// Retract the desire to stake for the transactor.
-	///
-	/// Effects will be felt at the beginning of the next era.
-	fn unstake(self) {
-		let mut intentions = IntentionStorageVec::items();
-		if let Some(position) = intentions.iter().position(|&t| t == *self) {
-			intentions.swap_remove(position);
-		} else {
-			panic!("Cannot unstake if not already staked.");
-		}
-		IntentionStorageVec::set_items(&intentions);
-		storage::put(&self.to_keyed_vec(BONDAGE_OF), &(current_era() + bonding_duration()));
-	}
-}
-
-impl_dispatch! {
-	pub mod privileged;
-	fn set_sessions_per_era(new: BlockNumber) = 0;
-	fn set_bonding_duration(new: BlockNumber) = 1;
-	fn set_validator_count(new: u32) = 2;
-	fn force_new_era() = 3;
-}
-
-impl privileged::Dispatch for democracy::PrivPass {
-	/// Set the number of sessions in an era.
-	fn set_sessions_per_era(self, new: BlockNumber) {
-		storage::put(NEXT_SESSIONS_PER_ERA, &new);
-	}
-
-	/// The length of the bonding duration in eras.
-	fn set_bonding_duration(self, new: BlockNumber) {
-		storage::put(BONDING_DURATION, &new);
-	}
-
-	/// The length of a staking era in sessions.
-	fn set_validator_count(self, new: u32) {
-		storage::put(VALIDATOR_COUNT, &new);
-	}
-
-	/// Force there to be a new era. This also forces a new session immediately after.
-	fn force_new_era(self) {
-		new_era();
-		session::internal::rotate_session();
-	}
-}
-
 // Each identity's stake may be in one of three bondage states, given by an integer:
 // - n | n <= CurrentEra::get(): inactive: free to be transferred.
 // - ~0: active: currently representing a validator.