extract out all primitives

substrate/wasm-runtime/polkadot/src/primitives/digest.rs

@@ -18,9 +18,9 @@
 
 use runtime_std::prelude::*;
 
+/// The digest of a block, useful for light-clients.
 #[derive(Clone, Default)]
 #[cfg_attr(feature = "std", derive(PartialEq, Debug))]
-/// The digest of a block, useful for light-clients.
 pub struct Digest {
 	/// All logs that have happened in the block.
 	pub logs: Vec<Vec<u8>>,

substrate/wasm-runtime/polkadot/src/primitives/proposal.rs

@@ -85,38 +85,6 @@ impl Slicable for Proposal {
 	}
 }
 
-impl Proposal {
-	pub fn enact(&self) {
-		let mut params = StreamReader::new(&self.input_data);
-		match self.function {
-			InternalFunction::SystemSetCode => {
-				let code: Vec<u8> = params.read().unwrap();
-				system::privileged::set_code(&code);
-			}
-			InternalFunction::StakingSetSessionsPerEra => {
-				let value = params.read().unwrap();
-				staking::privileged::set_sessions_per_era(value);
-			}
-			InternalFunction::StakingSetBondingDuration => {
-				let value = params.read().unwrap();
-				staking::privileged::set_bonding_duration(value);
-			}
-			InternalFunction::StakingSetValidatorCount => {
-				let value = params.read().unwrap();
-				staking::privileged::set_validator_count(value);
-			}
-			InternalFunction::GovernanceSetApprovalPpmRequired => {
-				let value = params.read().unwrap();
-				governance::privileged::set_approval_ppm_required(value);
-			}
-			InternalFunction::SessionSetLength => {
-				let value = params.read().unwrap();
-				session::privileged::set_length(value);
-			}
-		}
-	}
-}
-
 #[cfg(test)]
 mod test {
 	use super::*;

substrate/wasm-runtime/polkadot/src/runtime/governance.rs

@@ -109,6 +109,36 @@ pub mod internal {
 			}
 		}
 	}
+
+	fn enact_proposal(proposal: Proposal) {
+		let mut params = StreamReader::new(&self.input_data);
+		match self.function {
+			InternalFunction::SystemSetCode => {
+				let code: Vec<u8> = params.read().unwrap();
+				system::privileged::set_code(&code);
+			}
+			InternalFunction::StakingSetSessionsPerEra => {
+				let value = params.read().unwrap();
+				staking::privileged::set_sessions_per_era(value);
+			}
+			InternalFunction::StakingSetBondingDuration => {
+				let value = params.read().unwrap();
+				staking::privileged::set_bonding_duration(value);
+			}
+			InternalFunction::StakingSetValidatorCount => {
+				let value = params.read().unwrap();
+				staking::privileged::set_validator_count(value);
+			}
+			InternalFunction::GovernanceSetApprovalPpmRequired => {
+				let value = params.read().unwrap();
+				governance::privileged::set_approval_ppm_required(value);
+			}
+			InternalFunction::SessionSetLength => {
+				let value = params.read().unwrap();
+				session::privileged::set_length(value);
+			}
+		}
+	}
 }
 
 #[cfg(test)]

substrate/wasm-runtime/polkadot/src/runtime/system.rs

@@ -49,6 +49,8 @@ pub mod privileged {
 pub mod internal {
 	use super::*;
 
+	struct CheckedTransaction(UncheckedTransaction);
+
 	/// Deposits a log and ensures it matches the blocks log data.
 	pub fn deposit_log(log: &[u8]) {
 		with_env(|e| {
@@ -115,7 +117,40 @@ pub mod internal {
 		storage::put(&nonce_key, &(expected_nonce + 1));
 
 		// decode parameters and dispatch
-		tx.function.dispatch(&tx.signed, &tx.input_data);
+		dispatch_function(&tx.function, &tx.signed, &tx.input_data);
+	}
+
+	fn dispatch_function(function: &Function, transactor: &AccountId, data: &[u8]) {
+		let mut params = ::runtime_codec::StreamReader::new(data);
+		match *self {
+			Function::StakingStake => {
+				staking::public::stake(transactor);
+			}
+			Function::StakingUnstake => {
+				staking::public::unstake(transactor);
+			}
+			Function::StakingTransfer => {
+				let dest = params.read().unwrap();
+				let value = params.read().unwrap();
+				staking::public::transfer(transactor, &dest, value);
+			}
+			Function::SessionSetKey => {
+				let session = params.read().unwrap();
+				session::public::set_key(transactor, &session);
+			}
+			Function::TimestampSet => {
+				let t = params.read().unwrap();
+				timestamp::public::set(t);
+			}
+			Function::GovernancePropose => {
+				let proposal = params.read().unwrap();
+				governance::public::propose(transactor, &proposal);
+			}
+			Function::GovernanceApprove => {
+				let era_index = params.read().unwrap();
+				governance::public::approve(transactor, era_index);
+			}
+		}
 	}
 }