grassrootseconomics/openethereum
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

EIP-98: Optional transaction state root (#4296)

Browse Source 
* EIP98: Optional receipt state root

* Use if-else

* Fixing tests
This commit is contained in:
Arkadiy Paronyan
2017-01-25 20:22:48 +01:00
committed by Gav Wood
parent f5a4b55dae
commit c012dfc3ef
22 changed files with 99 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
rpc/src/v1/tests/mocked/eth.rs
View File

@@ -969,7 +969,7 @@ fn rpc_eth_transaction_receipt() {
log_index: 1,
}],
log_bloom: 0.into(),
state_root: 0.into(),
state_root: Some(0.into()),
};
let hash = H256::from_str("b903239f8543d04b5dc1ba6579132b143087c68db1b2168786408fcbce568238").unwrap();

10
rpc/src/v1/types/receipt.rs
View File

@@ -45,7 +45,7 @@ pub struct Receipt {
pub logs: Vec<Log>,
/// State Root
#[serde(rename="root")]
pub state_root: H256,
pub state_root: Option<H256>,
/// Logs bloom
#[serde(rename="logsBloom")]
pub logs_bloom: H2048,
@@ -62,7 +62,7 @@ impl From<LocalizedReceipt> for Receipt {
gas_used: Some(r.gas_used.into()),
contract_address: r.contract_address.map(Into::into),
logs: r.logs.into_iter().map(Into::into).collect(),
state_root: r.state_root.into(),
state_root: r.state_root.map(Into::into),
logs_bloom: r.log_bloom.into(),
}
}
@@ -79,7 +79,7 @@ impl From<RichReceipt> for Receipt {
gas_used: Some(r.gas_used.into()),
contract_address: r.contract_address.map(Into::into),
logs: r.logs.into_iter().map(Into::into).collect(),
state_root: r.state_root.into(),
state_root: r.state_root.map(Into::into),
logs_bloom: r.log_bloom.into(),
}
}
@@ -96,7 +96,7 @@ impl From<EthReceipt> for Receipt {
gas_used: None,
contract_address: None,
logs: r.logs.into_iter().map(Into::into).collect(),
state_root: r.state_root.into(),
state_root: r.state_root.map(Into::into),
logs_bloom: r.log_bloom.into(),
}
}
@@ -135,7 +135,7 @@ mod tests {
log_type: "mined".into(),
}],
logs_bloom: 15.into(),
state_root: 10.into(),
state_root: Some(10.into()),
};
let serialized = serde_json::to_string(&receipt).unwrap();