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

Fixing compilation on latest nightly (#1736)

Browse Source
This commit is contained in:
Tomasz Drwięga 2016-07-27 17:12:14 +02:00 committed by Gav Wood
parent 02cf48681d
commit edda0b2380
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ethcore/src/types/transaction.rs
View File

@ -91,7 +91,7 @@ impl Transaction {
impl From<ethjson::state::Transaction> for SignedTransaction { impl From<ethjson::state::Transaction> for SignedTransaction {
fn from(t: ethjson::state::Transaction) -> Self { fn from(t: ethjson::state::Transaction) -> Self {
let to: Option<_> = t.to.into(); let to: Option<ethjson::hash::Address> = t.to.into();
Transaction { Transaction {
nonce: t.nonce.into(), nonce: t.nonce.into(),
gas_price: t.gas_price.into(), gas_price: t.gas_price.into(),
@ -108,7 +108,7 @@ impl From<ethjson::state::Transaction> for SignedTransaction {
impl From<ethjson::transaction::Transaction> for SignedTransaction { impl From<ethjson::transaction::Transaction> for SignedTransaction {
fn from(t: ethjson::transaction::Transaction) -> Self { fn from(t: ethjson::transaction::Transaction) -> Self {
let to: Option<_> = t.to.into(); let to: Option<ethjson::hash::Address> = t.to.into();
SignedTransaction { SignedTransaction {
unsigned: Transaction { unsigned: Transaction {
nonce: t.nonce.into(), nonce: t.nonce.into(),