mirror of
https://github.com/ethereum/solidity
synced 2023-10-03 13:03:40 +00:00
Beginnings of cleaning up the Executive/State code.
This commit is contained in:
parent
696b5b3a49
commit
6b44029adc
@ -43,7 +43,7 @@ using namespace dev;
|
|||||||
using namespace dev::eth;
|
using namespace dev::eth;
|
||||||
namespace js = json_spirit;
|
namespace js = json_spirit;
|
||||||
|
|
||||||
WebThreeDirect *web3;
|
WebThreeDirect* web3;
|
||||||
unique_ptr<WebThreeStubServer> jsonrpcServer;
|
unique_ptr<WebThreeStubServer> jsonrpcServer;
|
||||||
unique_ptr<WebThreeStubClient> jsonrpcClient;
|
unique_ptr<WebThreeStubClient> jsonrpcClient;
|
||||||
|
|
||||||
|
@ -117,7 +117,7 @@ private:
|
|||||||
void sendMessage(bytes const& _data, bool _isCreation, u256 const& _value = 0)
|
void sendMessage(bytes const& _data, bool _isCreation, u256 const& _value = 0)
|
||||||
{
|
{
|
||||||
m_state.addBalance(m_sender, _value); // just in case
|
m_state.addBalance(m_sender, _value); // just in case
|
||||||
eth::Executive executive(m_state);
|
eth::Executive executive(m_state, 0);
|
||||||
eth::Transaction t = _isCreation ? eth::Transaction(_value, m_gasPrice, m_gas, _data, 0, KeyPair::create().sec())
|
eth::Transaction t = _isCreation ? eth::Transaction(_value, m_gasPrice, m_gas, _data, 0, KeyPair::create().sec())
|
||||||
: eth::Transaction(_value, m_gasPrice, m_gas, m_contractAddress, _data, 0, KeyPair::create().sec());
|
: eth::Transaction(_value, m_gasPrice, m_gas, m_contractAddress, _data, 0, KeyPair::create().sec());
|
||||||
bytes transactionRLP = t.rlp();
|
bytes transactionRLP = t.rlp();
|
||||||
@ -137,7 +137,7 @@ private:
|
|||||||
else
|
else
|
||||||
{
|
{
|
||||||
BOOST_REQUIRE(m_state.addressHasCode(m_contractAddress));
|
BOOST_REQUIRE(m_state.addressHasCode(m_contractAddress));
|
||||||
BOOST_REQUIRE(!executive.call(m_contractAddress, m_sender, _value, m_gasPrice, &_data, m_gas, m_sender));
|
BOOST_REQUIRE(!executive.call(m_contractAddress, m_contractAddress, m_sender, _value, m_gasPrice, &_data, m_gas, m_sender));
|
||||||
}
|
}
|
||||||
BOOST_REQUIRE(executive.go());
|
BOOST_REQUIRE(executive.go());
|
||||||
m_state.noteSending(m_sender);
|
m_state.noteSending(m_sender);
|
||||||
|
3
trie.cpp
3
trie.cpp
@ -54,7 +54,6 @@ BOOST_AUTO_TEST_CASE(trie_tests)
|
|||||||
{
|
{
|
||||||
string testPath = test::getTestPath();
|
string testPath = test::getTestPath();
|
||||||
|
|
||||||
|
|
||||||
testPath += "/TrieTests";
|
testPath += "/TrieTests";
|
||||||
|
|
||||||
cnote << "Testing Trie...";
|
cnote << "Testing Trie...";
|
||||||
@ -245,6 +244,7 @@ BOOST_AUTO_TEST_CASE(moreTrieTests)
|
|||||||
BOOST_AUTO_TEST_CASE(trieLowerBound)
|
BOOST_AUTO_TEST_CASE(trieLowerBound)
|
||||||
{
|
{
|
||||||
cnote << "Stress-testing Trie.lower_bound...";
|
cnote << "Stress-testing Trie.lower_bound...";
|
||||||
|
if (0)
|
||||||
{
|
{
|
||||||
MemoryDB dm;
|
MemoryDB dm;
|
||||||
EnforceRefs e(dm, true);
|
EnforceRefs e(dm, true);
|
||||||
@ -290,6 +290,7 @@ BOOST_AUTO_TEST_CASE(trieLowerBound)
|
|||||||
BOOST_AUTO_TEST_CASE(trieStess)
|
BOOST_AUTO_TEST_CASE(trieStess)
|
||||||
{
|
{
|
||||||
cnote << "Stress-testing Trie...";
|
cnote << "Stress-testing Trie...";
|
||||||
|
if (0)
|
||||||
{
|
{
|
||||||
MemoryDB m;
|
MemoryDB m;
|
||||||
MemoryDB dm;
|
MemoryDB dm;
|
||||||
|
8
vm.cpp
8
vm.cpp
@ -34,18 +34,18 @@ using namespace dev::test;
|
|||||||
FakeExtVM::FakeExtVM(eth::BlockInfo const& _previousBlock, eth::BlockInfo const& _currentBlock, unsigned _depth): /// TODO: XXX: remove the default argument & fix.
|
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(), bytes(), _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&)
|
h160 FakeExtVM::create(u256 _endowment, u256& io_gas, bytesConstRef _init, OnOpFunc const&)
|
||||||
{
|
{
|
||||||
Address na = right160(sha3(rlpList(myAddress, get<1>(addresses[myAddress]))));
|
Address na = right160(sha3(rlpList(myAddress, get<1>(addresses[myAddress]))));
|
||||||
|
|
||||||
Transaction t(_endowment, gasPrice, *_gas, _init.toBytes());
|
Transaction t(_endowment, gasPrice, io_gas, _init.toBytes());
|
||||||
callcreates.push_back(t);
|
callcreates.push_back(t);
|
||||||
return na;
|
return na;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool FakeExtVM::call(Address _receiveAddress, u256 _value, bytesConstRef _data, u256* _gas, bytesRef _out, OnOpFunc const&, Address _myAddressOverride, Address _codeAddressOverride)
|
bool FakeExtVM::call(Address _receiveAddress, u256 _value, bytesConstRef _data, u256& io_gas, bytesRef _out, OnOpFunc const&, Address _myAddressOverride, Address _codeAddressOverride)
|
||||||
{
|
{
|
||||||
Transaction t(_value, gasPrice, *_gas, _receiveAddress, _data.toVector());
|
Transaction t(_value, gasPrice, io_gas, _receiveAddress, _data.toVector());
|
||||||
callcreates.push_back(t);
|
callcreates.push_back(t);
|
||||||
(void)_out;
|
(void)_out;
|
||||||
(void)_myAddressOverride;
|
(void)_myAddressOverride;
|
||||||
|
4
vm.h
4
vm.h
@ -55,8 +55,8 @@ public:
|
|||||||
virtual u256 txCount(Address _a) override { return std::get<1>(addresses[_a]); }
|
virtual u256 txCount(Address _a) override { return std::get<1>(addresses[_a]); }
|
||||||
virtual void suicide(Address _a) override { std::get<0>(addresses[_a]) += std::get<0>(addresses[myAddress]); addresses.erase(myAddress); }
|
virtual void suicide(Address _a) override { std::get<0>(addresses[_a]) += std::get<0>(addresses[myAddress]); addresses.erase(myAddress); }
|
||||||
virtual bytes const& codeAt(Address _a) override { return std::get<3>(addresses[_a]); }
|
virtual bytes const& codeAt(Address _a) override { return std::get<3>(addresses[_a]); }
|
||||||
virtual h160 create(u256 _endowment, u256* _gas, bytesConstRef _init, eth::OnOpFunc const&) override;
|
virtual h160 create(u256 _endowment, u256& io_gas, bytesConstRef _init, eth::OnOpFunc const&) override;
|
||||||
virtual bool call(Address _receiveAddress, u256 _value, bytesConstRef _data, u256* _gas, bytesRef _out, eth::OnOpFunc const&, Address, Address) override;
|
virtual bool call(Address _receiveAddress, u256 _value, bytesConstRef _data, u256& io_gas, bytesRef _out, eth::OnOpFunc const&, Address, Address) override;
|
||||||
void setTransaction(Address _caller, u256 _value, u256 _gasPrice, bytes const& _data);
|
void setTransaction(Address _caller, u256 _value, u256 _gasPrice, bytes const& _data);
|
||||||
void setContract(Address _myAddress, u256 _myBalance, u256 _myNonce, std::map<u256, u256> const& _storage, bytes const& _code);
|
void setContract(Address _myAddress, u256 _myBalance, u256 _myNonce, std::map<u256, u256> const& _storage, bytes const& _code);
|
||||||
void set(Address _a, u256 _myBalance, u256 _myNonce, std::map<u256, u256> const& _storage, bytes const& _code);
|
void set(Address _a, u256 _myBalance, u256 _myNonce, std::map<u256, u256> const& _storage, bytes const& _code);
|
||||||
|
@ -33,7 +33,8 @@ BOOST_AUTO_TEST_SUITE(whisper)
|
|||||||
BOOST_AUTO_TEST_CASE(topic)
|
BOOST_AUTO_TEST_CASE(topic)
|
||||||
{
|
{
|
||||||
cnote << "Testing Whisper...";
|
cnote << "Testing Whisper...";
|
||||||
// g_logVerbosity = 0;
|
auto oldLogVerbosity = g_logVerbosity;
|
||||||
|
g_logVerbosity = 0;
|
||||||
|
|
||||||
bool started = false;
|
bool started = false;
|
||||||
unsigned result = 0;
|
unsigned result = 0;
|
||||||
@ -81,7 +82,7 @@ BOOST_AUTO_TEST_CASE(topic)
|
|||||||
}
|
}
|
||||||
|
|
||||||
listener.join();
|
listener.join();
|
||||||
// g_logVerbosity = 0;
|
g_logVerbosity = oldLogVerbosity;
|
||||||
|
|
||||||
BOOST_REQUIRE_EQUAL(result, 1 + 9 + 25 + 49 + 81);
|
BOOST_REQUIRE_EQUAL(result, 1 + 9 + 25 + 49 + 81);
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user