diff options
| author | chriseth <c@ethdev.com> | 2016-06-09 20:57:16 +0800 |
|---|---|---|
| committer | chriseth <c@ethdev.com> | 2016-06-29 05:18:54 +0800 |
| commit | ad36fc3c58466f1a03f96dda0a7e74f418f8bed9 (patch) | |
| tree | 41156f636ae714f8ad7d2dbf4b06f8616db98e01 /test | |
| parent | a92398a3006af49606b41f16117e3f9fa0c06999 (diff) | |
| download | dexon-solidity-ad36fc3c58466f1a03f96dda0a7e74f418f8bed9.tar.gz dexon-solidity-ad36fc3c58466f1a03f96dda0a7e74f418f8bed9.tar.zst dexon-solidity-ad36fc3c58466f1a03f96dda0a7e74f418f8bed9.zip | |
Style
Diffstat (limited to 'test')
| -rw-r--r-- | test/IPCSocket.h | 6 | ||||
| -rw-r--r-- | test/libsolidity/solidityExecutionFramework.h | 14 |
2 files changed, 11 insertions, 9 deletions
diff --git a/test/IPCSocket.h b/test/IPCSocket.h index fbb07c1f..97434a36 100644 --- a/test/IPCSocket.h +++ b/test/IPCSocket.h @@ -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); diff --git a/test/libsolidity/solidityExecutionFramework.h b/test/libsolidity/solidityExecutionFramework.h index bce073ec..14d27ffa 100644 --- a/test/libsolidity/solidityExecutionFramework.h +++ b/test/libsolidity/solidityExecutionFramework.h @@ -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> |