[WIP] Remove order

Author: joojis

core/src/codechain_machine.rs

@@ -18,7 +18,7 @@
 use ckey::Address;
 use cstate::{StateError, TopState, TopStateView};
 use ctypes::errors::{HistoryError, SyntaxError};
-use ctypes::transaction::{Action, AssetTransferInput, OrderOnTransfer, Timelock};
+use ctypes::transaction::{Action, AssetTransferInput, Timelock};
 use ctypes::{CommonParams, Header};
 
 use crate::block::{ExecutedBlock, IsBlock};
@@ -79,7 +79,6 @@ impl CodeChainMachine {
     ) -> Result<(), Error> {
         if let Action::TransferAsset {
             inputs,
-            orders,
             expiration,
             ..
         } = &tx.action
@@ -88,7 +87,6 @@ impl CodeChainMachine {
             if verify_timelock {
                 Self::verify_transfer_timelock(inputs, header, client)?;
             }
-            Self::verify_transfer_order_expired(orders, header)?;
         }
         // FIXME: Filter transactions.
         Ok(())
@@ -176,19 +174,6 @@ impl CodeChainMachine {
         Ok(())
     }
 
-    fn verify_transfer_order_expired(orders: &[OrderOnTransfer], header: &Header) -> Result<(), Error> {
-        for order_tx in orders {
-            if order_tx.order.expiration < header.timestamp() {
-                return Err(HistoryError::OrderExpired {
-                    expiration: order_tx.order.expiration,
-                    timestamp: header.timestamp(),
-                }
-                .into())
-            }
-        }
-        Ok(())
-    }
-
     pub fn min_cost(params: &CommonParams, action: &Action) -> u64 {
         match action {
             Action::MintAsset {

rpc/src/v1/impls/devel.rs

@@ -174,7 +174,6 @@ where
                         burns: vec![],
                         inputs: $inputs,
                         outputs: $outputs,
-                        orders: vec![],
                         metadata: "".to_string(),
                         approvals: vec![],
                         expiration: None,

rpc/src/v1/types/action.rs

@@ -24,7 +24,7 @@ use primitives::{Bytes, H160, H256};
 use rustc_serialize::hex::{FromHex, ToHex};
 
 use super::super::errors::ConversionError;
-use super::{AssetMintOutput, AssetTransferInput, AssetTransferOutput, OrderOnTransfer};
+use super::{AssetMintOutput, AssetTransferInput, AssetTransferOutput};
 
 #[derive(Debug, Deserialize, PartialEq)]
 #[serde(rename_all = "camelCase", tag = "type")]
@@ -48,7 +48,6 @@ pub enum Action {
         burns: Vec<AssetTransferInput>,
         inputs: Vec<AssetTransferInput>,
         outputs: Vec<AssetTransferOutput>,
-        orders: Vec<OrderOnTransfer>,
 
         metadata: String,
         approvals: Vec<Signature>,
@@ -172,7 +171,6 @@ pub enum ActionWithTracker {
         burns: Vec<AssetTransferInput>,
         inputs: Vec<AssetTransferInput>,
         outputs: Vec<AssetTransferOutput>,
-        orders: Vec<OrderOnTransfer>,
 
         metadata: String,
         approvals: Vec<Signature>,
@@ -314,7 +312,6 @@ impl ActionWithTracker {
                 burns,
                 inputs,
                 outputs,
-                orders,
                 metadata,
                 approvals,
                 expiration,
@@ -323,7 +320,6 @@ impl ActionWithTracker {
                 burns: burns.into_iter().map(From::from).collect(),
                 inputs: inputs.into_iter().map(From::from).collect(),
                 outputs: outputs.into_iter().map(From::from).collect(),
-                orders: orders.into_iter().map(From::from).collect(),
                 metadata,
                 approvals,
                 expiration: expiration.map(From::from),
@@ -528,20 +524,17 @@ impl TryFrom<Action> for ActionType {
                 burns,
                 inputs,
                 outputs,
-                orders,
 
                 metadata,
                 approvals,
                 expiration,
             } => {
                 let outputs = outputs.into_iter().map(TryFrom::try_from).collect::<Result<_, _>>()?;
-                let orders = orders.into_iter().map(TryFrom::try_from).collect::<Result<_, _>>()?;
                 ActionType::TransferAsset {
                     network_id,
                     burns: burns.into_iter().map(From::from).collect(),
                     inputs: inputs.into_iter().map(From::from).collect(),
                     outputs,
-                    orders,
                     metadata,
                     approvals,
                     expiration: expiration.map(From::from),

rpc/src/v1/types/mod.rs

@@ -20,7 +20,6 @@ mod asset_input;
 mod asset_output;
 mod asset_scheme;
 mod block;
-mod order;
 mod text;
 mod transaction;
 mod unsigned_transaction;
@@ -31,7 +30,6 @@ use primitives::H256;
 use self::asset::Asset;
 use self::asset_input::{AssetOutPoint, AssetTransferInput};
 use self::asset_output::{AssetMintOutput, AssetTransferOutput};
-use self::order::OrderOnTransfer;
 
 pub use self::action::{Action, ActionWithTracker};
 pub use self::asset::OwnedAsset;