move function and proposal types to transaction module

This commit is contained in:
Robert Habermeier
2018-02-06 16:42:32 +01:00
parent 4378ce7887
commit 6aaf446352
11 changed files with 289 additions and 324 deletions
@@ -29,7 +29,7 @@ use runtime_std::prelude::*;
use codec::KeyedVec;
use support::storage;
use primitives::{AccountId, Hash, BlockNumber};
use primitives::proposal::Proposal;
use primitives::transaction::Proposal;
use runtime::{staking, system, session};
const APPROVALS_REQUIRED: &[u8] = b"gov:apr";
@@ -95,7 +95,7 @@ pub mod privileged {
pub mod internal {
use super::*;
use primitives::proposal::{Proposal, InternalFunction};
use primitives::transaction::{Proposal, InternalFunction};
/// Current era is ending; we should finish up any proposals.
pub fn end_of_an_era() {
@@ -150,7 +150,7 @@ mod tests {
use codec::{KeyedVec, Joiner};
use support::{one, two, with_env};
use primitives::AccountId;
use primitives::proposal::InternalFunction;
use primitives::transaction::InternalFunction;
use runtime::{staking, session};
fn new_test_ext() -> TestExternalities {
@@ -23,8 +23,7 @@ use codec::{KeyedVec, Slicable};
use support::{Hashable, storage, with_env};
use primitives::{AccountId, Hash, TxOrder};
use primitives::block::{Block, Header, Number as BlockNumber};
use primitives::transaction::UncheckedTransaction;
use primitives::runtime_function::Function;
use primitives::transaction::{UncheckedTransaction, Function};
use runtime::{staking, session};
const NONCE_OF: &[u8] = b"sys:non:";
@@ -215,8 +214,7 @@ mod tests {
use runtime_std::{with_externalities, twox_128, TestExternalities};
use codec::{Joiner, KeyedVec, Slicable};
use support::{StaticHexInto, HexDisplay, one, two};
use primitives::transaction::{UncheckedTransaction, Transaction};
use primitives::runtime_function::Function;
use primitives::transaction::{UncheckedTransaction, Transaction, Function};
use primitives::block::{Header, Digest};
use runtime::staking;
@@ -338,7 +338,7 @@ mod tests {
#[test]
fn proposals_can_be_stored() {
use primitives::proposal::{Proposal, InternalFunction};
use primitives::transaction::{Proposal, InternalFunction};
let mut t = TestExternalities { storage: HashMap::new(), };
with_externalities(&mut t, || {
let x = Proposal {