Move ParcelOutcome to types

Author: Seulgi Kim

core/src/block.rs

@@ -20,7 +20,7 @@ use ccrypto::BLAKE_NULL_RLP;
 use ckey::Address;
 use cmerkle::skewed_merkle_root;
 use ctypes::invoice::{Invoice, ParcelInvoice};
-use ctypes::parcel::Error as ParcelError;
+use ctypes::parcel::{Error as ParcelError, Outcome as ParcelOutcome};
 use primitives::{Bytes, H256};
 use rlp::{Decodable, DecoderError, Encodable, RlpStream, UntrustedRlp};
 use trie::TrieFactory;
@@ -31,7 +31,7 @@ use super::error::{BlockError, Error};
 use super::header::{Header, Seal};
 use super::machine::{LiveBlock, Parcels};
 use super::parcel::{SignedParcel, UnverifiedParcel};
-use super::state::{ParcelOutcome, StateWithCache, TopLevelState};
+use super::state::{StateWithCache, TopLevelState};
 use super::state_db::StateDB;
 
 /// A block, encoded as it is on the block chain.

core/src/state/mod.rs

@@ -58,6 +58,6 @@ pub use self::metadata::{Metadata, MetadataAddress};
 pub use self::shard::{Shard, ShardAddress};
 pub use self::shard_metadata::{ShardMetadata, ShardMetadataAddress};
 pub use self::shard_state::ShardState;
-pub use self::top_level::{ParcelOutcome, TopLevelState};
+pub use self::top_level::TopLevelState;
 pub use self::top_state::TopState;
 pub use self::traits::StateWithCache;

core/src/state/top_level.rs

@@ -41,7 +41,7 @@ use std::fmt;
 use ccrypto::BLAKE_NULL_RLP;
 use ckey::{Address, Public};
 use ctypes::invoice::Invoice;
-use ctypes::parcel::{Action, ChangeShard, Error as ParcelError};
+use ctypes::parcel::{Action, ChangeShard, Error as ParcelError, Outcome as ParcelOutcome};
 use ctypes::transaction::{Outcome as TransactionOutcome, Transaction};
 use error::Error;
 use parcel::SignedParcel;
@@ -63,16 +63,6 @@ use super::shard_state::ShardState;
 use super::top_state::TopState;
 use super::traits::{CheckpointId, StateWithCache, StateWithCheckpoint};
 
-/// Used to return information about an `State::apply` operation.
-#[derive(Debug, PartialEq)]
-pub enum ParcelOutcome {
-    Single {
-        invoice: Invoice,
-        error: Option<ParcelError>,
-    },
-    Transactions(Vec<TransactionOutcome>),
-}
-
 /// Representation of the entire state of all accounts in the system.
 ///
 /// `State` can work together with `StateDB` to share account cache.

types/src/parcel/mod.rs

@@ -16,8 +16,10 @@
 
 mod action;
 mod error;
+mod outcome;
 mod parcel;
 
 pub use self::action::{Action, ChangeShard};
 pub use self::error::Error;
+pub use self::outcome::Outcome;
 pub use self::parcel::Parcel;

types/src/parcel/outcome.rs

@@ -0,0 +1,28 @@
+// Copyright 2018 Kodebox, Inc.
+// This file is part of CodeChain.
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as
+// published by the Free Software Foundation, either version 3 of the
+// License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+use super::super::invoice::Invoice;
+use super::super::transaction::Outcome as TransactionOutcome;
+use super::Error;
+
+#[derive(Debug, PartialEq)]
+pub enum Outcome {
+    Single {
+        invoice: Invoice,
+        error: Option<Error>,
+    },
+    Transactions(Vec<TransactionOutcome>),
+}