Modification of traces moved to engines

ethcore/src/trace/executive_tracer.rs

@@ -151,11 +151,7 @@ impl Tracer for ExecutiveTracer {
 	fn trace_suicide(&mut self, address: Address, balance: U256, refund_address: Address) {
 		let trace = FlatTrace {
 			subtraces: 0,
-			action: Action::Suicide(Suicide {
-				address: address,
-				refund_address: refund_address,
-				balance: balance,
-			}),
+			action: Action::Suicide(Suicide { address, refund_address, balance } ),
 			result: Res::None,
 			trace_address: Default::default(),
 		};
@@ -166,11 +162,7 @@ impl Tracer for ExecutiveTracer {
 	fn trace_reward(&mut self, author: Address, value: U256, reward_type: RewardType) {
 		let trace = FlatTrace {
 			subtraces: 0,
-			action: Action::Reward(Reward {
-				author: author,
-				value: value,
-				reward_type: reward_type,
-			}),
+			action: Action::Reward(Reward { author, value, reward_type } ),
 			result: Res::None,
 			trace_address: Default::default(),
 		};

ethcore/src/trace/types/trace.rs

@@ -222,8 +222,6 @@ impl Create {
 #[derive(Debug, PartialEq, Clone)]
 #[cfg_attr(feature = "ipc", binary)]
 pub enum RewardType {
-	/// None
-	None,
 	/// Block
 	Block,
 	/// Uncle
@@ -233,9 +231,8 @@ pub enum RewardType {
 impl Encodable for RewardType {
 	fn rlp_append(&self, s: &mut RlpStream) {
 		let v = match *self {
-			RewardType::None => 0u32,
-			RewardType::Block => 1,
-			RewardType::Uncle => 2,
+			RewardType::Block => 0u32,
+			RewardType::Uncle => 1,
 		};
 		Encodable::rlp_append(&v, s);
 	}
@@ -244,9 +241,8 @@ impl Encodable for RewardType {
 impl Decodable for RewardType {
 	fn decode(rlp: &UntrustedRlp) -> Result<Self, DecoderError> {
 		rlp.as_val().and_then(|v| Ok(match v {
-			0u32 => RewardType::None,
-			1 => RewardType::Block,
-			2 => RewardType::Uncle,
+			0u32 => RewardType::Block,
+			1 => RewardType::Uncle,
 			_ => return Err(DecoderError::Custom("Invalid value of RewardType item")),
 		}))
 	}