cerc-io/solidity
16
0
Fork 0
mirror of https://github.com/ethereum/solidity synced 2023-10-03 13:03:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Style

Browse Source
This commit is contained in:
chriseth 2016-06-09 14:57:16 +02:00
parent a92398a300
commit ad36fc3c58
3 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -35,7 +35,7 @@ if (NOT EMSCRIPTEN)
add_subdirectory(lllc)
endif()
if (TESTS AND NOT EMSCRIPTEN AND NOT WIN32)
if (TESTS AND NOT EMSCRIPTEN)
add_subdirectory(test)
endif()

6
test/IPCSocket.h
View File

@ -36,6 +36,8 @@ public:
string sendRequest(string const& _req);
~IPCSocket() { close(m_socket); fclose(m_fp); }
static IPCSocket& instance();
private:
FILE *m_fp;
string m_address;
@ -56,7 +58,7 @@ public:
string data;
};
struct transactionReceipt
struct TransactionReceipt
{
string gasUsed;
string contractAddress;
@ -65,7 +67,7 @@ public:
RPCRequest(string const& _localSocketAddress): m_ipcSocket(_localSocketAddress) {}
string eth_getCode(string const& _address, string const& _blockNumber);
string eth_call(transactionData const& _td, string const& _blockNumber);
transactionReceipt eth_getTransactionReceipt(string const& _transactionHash);
TransactionReceipt eth_getTransactionReceipt(string const& _transactionHash);
string eth_sendTransaction(transactionData const& _transactionData);
string eth_sendTransaction(string const& _transaction);
string eth_getBalance(string const& _address, string const& _blockNumber);

14
test/libsolidity/solidityExecutionFramework.h
View File

@ -51,8 +51,7 @@ class ExecutionFramework
public:
ExecutionFramework():
m_state(0),
m_socket("/home/wins/Ethereum/testnet/ethnode1/geth.ipc")
//m_socket("/media/www/STUFF/Ethereum/testnet/ethnode1/datadir/geth.ipc")
m_socket("/tmp/test/geth.ipc")
{
eth::NoProof::init();
m_sealEngine.reset(eth::ChainParams().createSealEngine());
@ -61,10 +60,10 @@ public:
string account = m_socket.personal_newAccount("qwerty");
m_socket.test_setChainParams(
"0x1000000000000000000000000000000000000000",
account,
"1000000000000000000000000000000000000000000000"
);
"0x1000000000000000000000000000000000000000",
account,
"1000000000000000000000000000000000000000000000"
);
m_socket.personal_unlockAccount(account, "qwerty", 10000);
m_sender = Address(account);
}
@ -124,7 +123,8 @@ public:
"Computed values do not match.\nSolidity: " +
toHex(solidityResult) +
"\nC++: " +
toHex(cppResult));
toHex(cppResult)
);
}
template <class CppFunction, class... Args>