Move TransactionOutcome to types

Author: Seulgi Kim

core/src/state/mod.rs

@@ -57,7 +57,7 @@ pub use self::info::{ShardStateInfo, TopStateInfo};
 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, TransactionOutcome};
+pub use self::shard_state::ShardState;
 pub use self::top_level::{ParcelOutcome, TopLevelState};
 pub use self::top_state::TopState;
 pub use self::traits::StateWithCache;

core/src/state/shard_level.rs

@@ -22,7 +22,8 @@ use ccrypto::{Blake, BLAKE_NULL_RLP};
 use ckey::Address;
 use ctypes::invoice::Invoice;
 use ctypes::transaction::{
-    AssetMintOutput, AssetTransferInput, AssetTransferOutput, Error as TransactionError, Transaction,
+    AssetMintOutput, AssetTransferInput, AssetTransferOutput, Error as TransactionError, Outcome as TransactionOutcome,
+    Transaction,
 };
 use cvm::{decode, execute, ScriptResult, VMConfig};
 use error::Error;
@@ -36,7 +37,7 @@ use super::cache::Cache;
 use super::traits::{CheckpointId, StateWithCache, StateWithCheckpoint};
 use super::{
     Asset, AssetAddress, AssetScheme, AssetSchemeAddress, Backend, ShardBackend, ShardMetadata, ShardMetadataAddress,
-    ShardState, ShardStateInfo, TransactionOutcome,
+    ShardState, ShardStateInfo,
 };
 
 pub struct ShardLevelState<B> {

core/src/state/shard_state.rs

@@ -14,9 +14,8 @@
 // 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 ctypes::transaction::{Error as TransactionError, Transaction};
+use ctypes::transaction::{Outcome as TransactionOutcome, Transaction};
 
-use ctypes::invoice::Invoice;
 use error::Error;
 
 use super::ShardBackend;
@@ -26,11 +25,3 @@ where
     B: ShardBackend, {
     fn apply(&mut self, transaction: &Transaction, parcel_network_id: &u64) -> Result<TransactionOutcome, Error>;
 }
-
-#[derive(Debug, PartialEq)]
-pub struct TransactionOutcome {
-    /// The invoice for the applied parcel.
-    pub invoice: Invoice,
-    /// The output of the applied parcel.
-    pub error: Option<TransactionError>,
-}

core/src/state/top_level.rs

@@ -42,7 +42,7 @@ use ccrypto::BLAKE_NULL_RLP;
 use ckey::{Address, Public};
 use ctypes::invoice::Invoice;
 use ctypes::parcel::{Action, ChangeShard, Error as ParcelError};
-use ctypes::transaction::Transaction;
+use ctypes::transaction::{Outcome as TransactionOutcome, Transaction};
 use error::Error;
 use parcel::SignedParcel;
 use primitives::{H256, U256};
@@ -59,7 +59,7 @@ use super::info::{ShardStateInfo, TopStateInfo};
 use super::metadata::{Metadata, MetadataAddress};
 use super::shard::{Shard, ShardAddress};
 use super::shard_level::ShardLevelState;
-use super::shard_state::{ShardState, TransactionOutcome};
+use super::shard_state::ShardState;
 use super::top_state::TopState;
 use super::traits::{CheckpointId, StateWithCache, StateWithCheckpoint};
 

types/src/transaction/mod.rs

@@ -15,7 +15,9 @@
 // along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 mod error;
+mod outcome;
 mod transaction;
 
 pub use self::error::Error;
+pub use self::outcome::Outcome;
 pub use self::transaction::{AssetMintOutput, AssetOutPoint, AssetTransferInput, AssetTransferOutput, Transaction};

types/src/transaction/outcome.rs

@@ -0,0 +1,26 @@
+// 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::Error;
+
+#[derive(Debug, PartialEq)]
+pub struct Outcome {
+    /// The invoice for the applied parcel.
+    pub invoice: Invoice,
+    /// The output of the applied parcel.
+    pub error: Option<Error>,
+}