diff options
| author | Christoph Jentzsch <jentzsch.software@gmail.com> | 2014-11-05 06:45:18 +0800 |
|---|---|---|
| committer | Christoph Jentzsch <jentzsch.software@gmail.com> | 2014-11-05 06:45:18 +0800 |
| commit | 086326b5dac42cd8d20d2f739dda1ff2ce6e1703 (patch) | |
| tree | a288fd5d5f89eefc1de1009c1bd9dd3e046ba409 /vm.cpp | |
| parent | 1fb562732e0b6fc59e709bc7f42c2881e86cf5b3 (diff) | |
| parent | 6199f74aaf3a5df73c0b88bc4de2611560813a78 (diff) | |
| download | dexon-solidity-086326b5dac42cd8d20d2f739dda1ff2ce6e1703.tar dexon-solidity-086326b5dac42cd8d20d2f739dda1ff2ce6e1703.tar.gz dexon-solidity-086326b5dac42cd8d20d2f739dda1ff2ce6e1703.tar.bz2 dexon-solidity-086326b5dac42cd8d20d2f739dda1ff2ce6e1703.tar.lz dexon-solidity-086326b5dac42cd8d20d2f739dda1ff2ce6e1703.tar.xz dexon-solidity-086326b5dac42cd8d20d2f739dda1ff2ce6e1703.tar.zst dexon-solidity-086326b5dac42cd8d20d2f739dda1ff2ce6e1703.zip | |
Merge branch 'StateBug' into NewStateTests
Diffstat (limited to 'vm.cpp')
| -rw-r--r-- | vm.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -29,7 +29,7 @@ using namespace dev::eth; using namespace dev::test; FakeExtVM::FakeExtVM(eth::BlockInfo const& _previousBlock, eth::BlockInfo const& _currentBlock, unsigned _depth): /// TODO: XXX: remove the default argument & fix. - ExtVMFace(Address(), Address(), Address(), 0, 1, bytesConstRef(), bytesConstRef(), _previousBlock, _currentBlock, _depth) {} + ExtVMFace(Address(), Address(), Address(), 0, 1, bytesConstRef(), bytes(), _previousBlock, _currentBlock, _depth) {} h160 FakeExtVM::create(u256 _endowment, u256* _gas, bytesConstRef _init, OnOpFunc const&) { @@ -206,11 +206,11 @@ void FakeExtVM::importExec(mObject& _o) gas = toInt(_o["gas"]); thisTxCode.clear(); - code = &thisTxCode; + code = thisTxCode; thisTxCode = importCode(_o); if (_o["code"].type() != str_type && _o["code"].type() != array_type) - code.reset(); + code.clear(); thisTxData.clear(); thisTxData = importData(_o); @@ -303,10 +303,10 @@ void doVMTests(json_spirit::mValue& v, bool _fillin) o["pre"] = mValue(fev.exportState()); fev.importExec(o["exec"].get_obj()); - if (!fev.code) + if (!fev.code.size()) { fev.thisTxCode = get<3>(fev.addresses.at(fev.myAddress)); - fev.code = &fev.thisTxCode; + fev.code = fev.thisTxCode; } bytes output; |