aboutsummaryrefslogtreecommitdiffstats
path: root/solidityExecutionFramework.h
diff options
context:
space:
mode:
authorCJentzsch <jentzsch.software@gmail.com>2015-04-02 17:06:56 +0800
committerCJentzsch <jentzsch.software@gmail.com>2015-04-02 17:06:56 +0800
commit125ca1d2702da04ff5b6e515d6193a832b80e1f2 (patch)
tree70f95d9fd8ce913550dc6415927551e684a6f868 /solidityExecutionFramework.h
parent32d5c950401504e3591ad41ee93459730c1a9ad8 (diff)
parent9d734e03fd085a3cbd1a403bd63e51da19e165b5 (diff)
downloaddexon-solidity-125ca1d2702da04ff5b6e515d6193a832b80e1f2.tar
dexon-solidity-125ca1d2702da04ff5b6e515d6193a832b80e1f2.tar.gz
dexon-solidity-125ca1d2702da04ff5b6e515d6193a832b80e1f2.tar.bz2
dexon-solidity-125ca1d2702da04ff5b6e515d6193a832b80e1f2.tar.lz
dexon-solidity-125ca1d2702da04ff5b6e515d6193a832b80e1f2.tar.xz
dexon-solidity-125ca1d2702da04ff5b6e515d6193a832b80e1f2.tar.zst
dexon-solidity-125ca1d2702da04ff5b6e515d6193a832b80e1f2.zip
Merge remote-tracking branch 'upstream/develop' into addTests
Conflicts: test/ttTransactionTestFiller.json
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)