aboutsummaryrefslogtreecommitdiffstats
path: root/solidityExecutionFramework.h
diff options
context:
space:
mode:
authorsubtly <subtly@users.noreply.github.com>2015-03-30 04:17:12 +0800
committersubtly <subtly@users.noreply.github.com>2015-03-30 04:17:12 +0800
commit602274c0ef07d9e816e97f47c6d556e0edd00758 (patch)
tree5a6ef7b011ec56447882bb5dd00c77ca145b8208 /solidityExecutionFramework.h
parentf6aaa7b12f64291a2ef8a723c5a1dd620751d0ac (diff)
parent5e28d981c729a929a37ba761e86a47de08ce9456 (diff)
downloaddexon-solidity-602274c0ef07d9e816e97f47c6d556e0edd00758.tar
dexon-solidity-602274c0ef07d9e816e97f47c6d556e0edd00758.tar.gz
dexon-solidity-602274c0ef07d9e816e97f47c6d556e0edd00758.tar.bz2
dexon-solidity-602274c0ef07d9e816e97f47c6d556e0edd00758.tar.lz
dexon-solidity-602274c0ef07d9e816e97f47c6d556e0edd00758.tar.xz
dexon-solidity-602274c0ef07d9e816e97f47c6d556e0edd00758.tar.zst
dexon-solidity-602274c0ef07d9e816e97f47c6d556e0edd00758.zip
Merge branch 'develop' into reqpeer
Conflicts: libp2p/Network.cpp
Diffstat (limited to 'solidityExecutionFramework.h')
-rw-r--r--solidityExecutionFramework.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/solidityExecutionFramework.h b/solidityExecutionFramework.h
index 86062a90..2451aa38 100644
--- a/solidityExecutionFramework.h
+++ b/solidityExecutionFramework.h
@@ -142,7 +142,8 @@ protected:
try
{
// this will throw since the transaction is invalid, but it should nevertheless store the transaction
- executive.setup(&transactionRLP);
+ executive.initialize(&transactionRLP);
+ executive.execute();
}
catch (...) {}
if (_isCreation)