Fix serialization of status in transaction receipts. (#6926)

openethereum · Nov 13, 2017 · 303036c · 303036c
1 parent b7e9152
commit 303036c
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/rpc/src/v1/types/receipt.rs b/rpc/src/v1/types/receipt.rs
@@ -14,7 +14,7 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
-use v1::types::{Log, H160, H256, H2048, U256};
+use v1::types::{Log, H160, H256, H2048, U256, U64};
 use ethcore::receipt::{Receipt as EthReceipt, RichReceipt, LocalizedReceipt, TransactionOutcome};
 
 /// Receipt
@@ -51,7 +51,7 @@ pub struct Receipt {
 	pub logs_bloom: H2048,
 	/// Status code
 	#[serde(rename="status")]
-	pub status_code: Option<u8>,
+	pub status_code: Option<U64>,
 }
 
 impl Receipt {
@@ -62,10 +62,10 @@ impl Receipt {
 		}
 	}
 
-	fn outcome_to_status_code(outcome: &TransactionOutcome) -> Option<u8> {
+	fn outcome_to_status_code(outcome: &TransactionOutcome) -> Option<U64> {
 		match *outcome {
 			TransactionOutcome::Unknown | TransactionOutcome::StateRoot(_) => None,
-			TransactionOutcome::StatusCode(ref code) => Some(*code),
+			TransactionOutcome::StatusCode(ref code) => Some((*code as u64).into()),
 		}
 	}
 }
@@ -131,7 +131,7 @@ mod tests {
 
 	#[test]
 	fn receipt_serialization() {
-		let s = r#"{"transactionHash":"0x0000000000000000000000000000000000000000000000000000000000000000","transactionIndex":"0x0","blockHash":"0xed76641c68a1c641aee09a94b3b471f4dc0316efe5ac19cf488e2674cf8d05b5","blockNumber":"0x4510c","cumulativeGasUsed":"0x20","gasUsed":"0x10","contractAddress":null,"logs":[{"address":"0x33990122638b9132ca29c723bdf037f1a891a70c","topics":["0xa6697e974e6a320f454390be03f74955e8978f1a6971ea6730542e37b66179bc","0x4861736852656700000000000000000000000000000000000000000000000000"],"data":"0x","blockHash":"0xed76641c68a1c641aee09a94b3b471f4dc0316efe5ac19cf488e2674cf8d05b5","blockNumber":"0x4510c","transactionHash":"0x0000000000000000000000000000000000000000000000000000000000000000","transactionIndex":"0x0","logIndex":"0x1","transactionLogIndex":null,"type":"mined"}],"root":"0x000000000000000000000000000000000000000000000000000000000000000a","logsBloom":"0x0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000f","status":null}"#;
+		let s = r#"{"transactionHash":"0x0000000000000000000000000000000000000000000000000000000000000000","transactionIndex":"0x0","blockHash":"0xed76641c68a1c641aee09a94b3b471f4dc0316efe5ac19cf488e2674cf8d05b5","blockNumber":"0x4510c","cumulativeGasUsed":"0x20","gasUsed":"0x10","contractAddress":null,"logs":[{"address":"0x33990122638b9132ca29c723bdf037f1a891a70c","topics":["0xa6697e974e6a320f454390be03f74955e8978f1a6971ea6730542e37b66179bc","0x4861736852656700000000000000000000000000000000000000000000000000"],"data":"0x","blockHash":"0xed76641c68a1c641aee09a94b3b471f4dc0316efe5ac19cf488e2674cf8d05b5","blockNumber":"0x4510c","transactionHash":"0x0000000000000000000000000000000000000000000000000000000000000000","transactionIndex":"0x0","logIndex":"0x1","transactionLogIndex":null,"type":"mined"}],"root":"0x000000000000000000000000000000000000000000000000000000000000000a","logsBloom":"0x0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000f","status":"0x1"}"#;
 
 		let receipt = Receipt {
 			transaction_hash: Some(0.into()),
@@ -158,7 +158,7 @@ mod tests {
 			}],
 			logs_bloom: 15.into(),
 			state_root: Some(10.into()),
-			status_code: None,
+			status_code: Some(1u64.into()),
 		};
 
 		let serialized = serde_json::to_string(&receipt).unwrap();