Commit Graph

21033 Commits

Author SHA1 Message Date
Christoph Jentzsch
8e6bfb1fb3 Merge remote-tracking branch 'upstream/develop' into stateTests
Conflicts:
	test/vm.cpp
	test/vmArithmeticTestFiller.json
	test/vmSha3TestFiller.json
2014-11-05 20:24:26 +01:00
Christoph Jentzsch
1d156a5726 Moved code export to export function in ImportHelper 2014-11-05 20:21:33 +01:00
subtly
d59a648985 Merge branch 'develop' into crypto
Conflicts:
	test/crypto.cpp
2014-11-05 19:08:25 +01:00
Christian
693bc90275 Further framework fix. 2014-11-05 18:50:23 +01:00
Gav Wood
7586bd2761 Merge pull request #473 from CJentzsch/newTests
new tests + reorganization
2014-11-05 17:42:47 +00:00
Christoph Jentzsch
6b6bb65eb8 Update transactions, style fix 2014-11-05 18:30:38 +01:00
Christian
849ccb4159 Fix test framework after change to Transaction. 2014-11-05 18:10:37 +01:00
Christian
e30d3f8d53 Merge remote-tracking branch 'ethereum/develop' into HEAD
Conflicts:
	libsolidity/Compiler.cpp
	test/solidityCompiler.cpp
2014-11-05 17:56:38 +01:00
Christian
3e73402ba3 Merge remote-tracking branch 'ethereum/develop' into HEAD
Conflicts:
	libsolidity/Compiler.cpp
	test/solidityCompiler.cpp
2014-11-05 17:56:38 +01:00
Christoph Jentzsch
b67ed5d065 remove vmSystemOperationsTest completely 2014-11-05 16:27:22 +01:00
subtly
90a0998968 Merge branch 'develop' into crypto 2014-11-05 16:11:06 +01:00
Christoph Jentzsch
26f4637205 Merge remote-tracking branch 'upstream/develop' into stateTests
Conflicts:
	test/state.cpp
	test/vm.cpp
2014-11-05 15:55:50 +01:00
Christoph Jentzsch
74f4b33d6a added state system operations test 2014-11-05 15:41:02 +01:00
Gav Wood
f8deb4b046 Transaction documentation and build fixes. 2014-11-05 14:32:23 +00:00
Gav Wood
d7da8b1aaa Documentation for Transaction. 2014-11-05 14:28:29 +00:00
Christian
fd980ea543 assert and exception corrections in solidity-external files. 2014-11-05 15:21:20 +01:00
Christian
f0c73b7a54 Stylistic corrections. 2014-11-05 15:04:33 +01:00
Christian
8c384232eb Converted all asserts to exceptions. 2014-11-05 15:01:24 +01:00
Christian
c1f7a1665f Converted all asserts to exceptions. 2014-11-05 15:01:24 +01:00
Gav Wood
aa41f1c6f1 Merge branch 'develop' of github.com:ethereum/cpp-ethereum into develop 2014-11-05 13:48:23 +00:00
Gav Wood
07ee2e4847 Classify Transaction. 2014-11-05 13:45:19 +00:00
subtly
25811ce5ff Merge branch 'develop' into crypto 2014-11-05 14:15:06 +01:00
subtly
4aeeb68d77 coding standards, documentation, new exception syntax 2014-11-05 14:13:27 +01:00
subtly
127747fd4e Merge branch 'develop' into crypto 2014-11-05 13:30:58 +01:00
Christoph Jentzsch
8220213b21 Merge remote-tracking branch 'upstream/develop' into StateBug 2014-11-05 13:22:38 +01:00
Paweł Bylica
631d8300ea Merge branch 'develop-evmcc' into pr-jit 2014-11-05 13:06:01 +01:00
Paweł Bylica
e2c84a98d9 Merge branch 'develop' into develop-evmcc 2014-11-05 12:59:18 +01:00
Christian
5dd8f3a937 Bugfix: Special case of statements starting with type conversion. 2014-11-05 07:35:31 +01:00
Christian
2432e2dbf3 Bugfix: Special case of statements starting with type conversion. 2014-11-05 07:35:31 +01:00
Christoph Jentzsch
adaf26d9ca uncomment vmIOandFlowOPerations test 2014-11-05 00:12:29 +01:00
Christoph Jentzsch
564764d5f7 Merge remote-tracking branch 'upstream/develop' into stateTests 2014-11-04 23:54:56 +01:00
Christoph Jentzsch
086326b5da Merge branch 'StateBug' into NewStateTests 2014-11-04 23:45:18 +01:00
Christoph Jentzsch
1fb562732e Merge remote-tracking branch 'upstream/develop' into NewStateTests 2014-11-04 23:44:50 +01:00
Christoph Jentzsch
a6f297a27d Merge branch 'newTests' into NewStateTests
Conflicts:
	test/vm.cpp
	test/vmArithmeticTestFiller.json
	test/vmSha3TestFiller.json
2014-11-04 23:08:20 +01:00
Christoph Jentzsch
4262fbd5e4 Added stSystemOperationsTest 2014-11-04 23:02:50 +01:00
Gav Wood
2d9771e4fe Merge pull request #465 from ethereum/bugfix
jsonrpc to run once, and only when jsonrpc test suite is invoked
2014-11-04 20:08:48 +00:00
chriseth
1de66d6e9e Added doxygen comment. 2014-11-04 19:52:04 +01:00
Paweł Bylica
7b3a2d65a6 Merge branch 'develop-evmcc' into pr-jit 2014-11-04 18:57:58 +01:00
Christoph Jentzsch
415a73f52b Merge remote-tracking branch 'upstream/develop' into newTests 2014-11-04 18:19:23 +01:00
Paweł Bylica
557fe30588 Merge branch 'develop' into develop-evmcc 2014-11-04 17:26:15 +01:00
Christoph Jentzsch
6199f74aaf Merge remote-tracking branch 'upstream/develop' into StateBug 2014-11-04 16:24:45 +01:00
subtly
838b6b4b44 coding standards. suite setup struct. 2014-11-04 15:24:02 +01:00
Gav Wood
b01be526db Merge pull request #468 from CJentzsch/bugfix
bugfix jumps after push
2014-11-04 13:29:40 +00:00
Christoph Jentzsch
f49fbb16a0 Merge remote-tracking branch 'upstream/develop' into NewStateTests 2014-11-04 14:04:17 +01:00
subtly
adc08af7c6 Merge branch 'develop' into bugfix 2014-11-04 13:46:33 +01:00
Christoph Jentzsch
37939c565d Merge pull request #454 from jorisbontje/423-dockerfile
update Dockerfile with cryptopp and jsonrpc dependencies, fixes #423

Cleaned up jsonrpc test

Forgot the #if

Undo jsonrpc test changes
2014-11-04 13:43:13 +01:00
Christoph Jentzsch
919d3c56eb # This is a combination of 2 commits.
# The first commit's message is:

Merge pull request #454 from jorisbontje/423-dockerfile

update Dockerfile with cryptopp and jsonrpc dependencies, fixes #423

Cleaned up jsonrpc test

# This is the 2nd commit message:

Forgot the #if
2014-11-04 13:43:04 +01:00
Christoph Jentzsch
3a5808c39f Update tests to latest protocol changes (PoC7) 2014-11-04 13:36:29 +01:00
Marek Kotewicz
51a0ca457f fixed WebThreeStubServer constructor 2014-11-04 12:03:24 +01:00
chriseth
ef546e789a Stylistic changes. 2014-11-04 11:56:19 +01:00