Commit Graph

1117 Commits

Author SHA1 Message Date
Roman Mandeleil c87a5c3cb6 Merge remote-tracking branch 'origin/master' 2015-01-22 12:49:45 +02:00
Roman Mandeleil 6fa25a2232 Update version for HELLO handshake 2015-01-22 12:49:25 +02:00
Roman Mandeleil 81fa268f93 Merge pull request #211 from ligi/bugfix/fix_readme_404_at_irc
Fix a 404 in the README
2015-01-21 22:40:30 +02:00
ligi 312daf42b8 Fix a 404 in the README 2015-01-21 21:32:35 +01:00
Roman Mandeleil 5e2c988c85 Merge pull request #204 from gubatron/npe-fix-issue-195
init account's ecKey and address, avoid reported NPE
2015-01-21 11:46:18 +02:00
Roman Mandeleil 9198c7d264 Merge pull request #209 from ligi/ligi/code_review/cleanup_blockchainimpl
Cleanup in BlockchainImpl
2015-01-21 11:39:43 +02:00
ligi 31b51f1380 Cleanup in BlockchainImpl 2015-01-20 23:47:30 +01:00
Roman Mandeleil d870beb206 Merge pull request #208 from ligi/ligi/bugfix/fix_system_properties_defaults
Fix how and when default properties are used
2015-01-20 23:33:26 +02:00
ligi c45cc8cc4d Fix how and when default properties are used 2015-01-20 22:25:46 +01:00
Roman Mandeleil 93f6228034 Correct config for redis cloud in heroku env 2015-01-20 21:17:44 +02:00
Roman Mandeleil 84859727c4 Get REDISCLOUD_URL from the getEnv 2015-01-20 19:11:45 +02:00
Roman Mandeleil ebd2496a26 Merge remote-tracking branch 'origin/master' 2015-01-20 17:31:02 +02:00
Roman Mandeleil c449c25d57 Get REDISCLOUD_URL from the getEnv 2015-01-20 17:30:47 +02:00
Roman Mandeleil f3c1044731 Merge pull request #207 from 8aff8265aa/master
Correct stSystemOperationsTest run with programCode.length protection
2015-01-20 17:10:21 +02:00
Faiz Khan 6ddec0b4d9 Correct stSystemOperationsTest run with programCode.length protection 2015-01-20 09:01:40 -06:00
Roman Mandeleil ff0f25252b Merge pull request #206 from ethereum/revert-205-master
Revert "Correct stSystemOperationsTest run with programCode.length prote...
2015-01-20 17:00:12 +02:00
Roman Mandeleil 121065fa4d Revert "Correct stSystemOperationsTest run with programCode.length protection" 2015-01-20 16:54:40 +02:00
Roman Mandeleil fc7f18104e Merge pull request #205 from 8aff8265aa/master
Correct stSystemOperationsTest run with programCode.length protection
2015-01-20 16:50:16 +02:00
Faiz Khan ddad1508b5 Correct stSystemOperationsTest run with programCode.length protection 2015-01-20 08:48:18 -06:00
Roman Mandeleil e2570f7072 Fix redis pool init 2015-01-20 15:58:15 +02:00
Roman Mandeleil 158a86dfd2 Make available keyvalue.datasource override by -D param 2015-01-20 14:17:40 +02:00
Roman Mandeleil d7f2c859ea Clean imports 2015-01-20 13:37:58 +02:00
Roman Mandeleil cfebc1d99c Merge remote-tracking branch 'origin/master'
Conflicts:
	ethereumj-core/src/main/java/org/ethereum/datasource/RedisDataSource.java
2015-01-20 13:37:10 +02:00
Roman Mandeleil a3bf5310a3 Introduce support redis cloud in heroku environment 2015-01-20 13:35:33 +02:00
Chris Beams 3a22a83be7
Configure Travis to notify Gitter on failure and first success
See https://gitter.im/ethereum/ethereumj
2015-01-20 12:34:28 +01:00
Chris Beams 9127c01890
Polish formatting
The sources affected by this commit have drifted in style since earlier
polishing commits such as f34d1f4 and a155518. The shared IDEA style
configuration file can help avoid this drift in the future. Simply run
Code->Reformat Code at the project level prior to committing. Note that
this code style configuration is not perfect, and not every change it
makes should be checked in. The ideal is to simply always write code that
conforms to the style conventions, but the automated settings are there
as a helping hand when necessary.

The churn caused by drifting style and the commits that fix it damage the
utility of git over time. Reviewing changes, analyzing history, surgically
reverting commits, and many other use cases with git simply do not work as
well when styles get mixed and fixed. Let's work toward a common style.
2015-01-20 12:20:09 +01:00
Chris Beams 38c241f9e6
Disable Javadoc formatting in shared IDEA style config
We do not (yet) have an agreed-upon approach to Javadoc content and
style, therefore disable automatic formatting from within IDEA for now.
2015-01-20 12:20:09 +01:00
Chris Beams 60b51b4aa6
Use @Ignore annotation from JUnit vs. Nashhorn 2015-01-20 12:20:08 +01:00
Chris Beams 2d785f9406
Optimize imports using shared IDEA configuration
The affected sources have drifted from import organization conventions
since the shared IDEA configuration was added in commit a155518. There
are several ways to avoid this in the future:

 1. Run Code->Optimize Imports manually prior to making any commit (or
    use the shortcut key).
 2. Select 'Optimize Imports on the Fly' from
    Preferences->Editor->General->Auto Import.

If IDEA is not being used, simply follow convention.
2015-01-20 12:20:08 +01:00
Chris Beams ee0e3e8aea
Strip trailing whitespace
Trailing whitespace has crept into the sources affected by this commit
since the original stripping in commit e5fcf5b. Editors and IDEs should
be configured to strip trailing whitespace on save, or in any case
trailing whitespace should be manually stripped prior to commit/push.
2015-01-20 12:20:07 +01:00
Chris Beams d55bc10a1a
Polish Javadoc
Fix syntax for @author and @since tags, for the same reasons detailed in
commits 7d2cf7f and c38907b, respectively.

Recommendations:

 - Disable automatic Javadoc templates completely within IDEA.
 - Add Javadoc by hand when new classes are created.
 - Follow the proper conventions for `@author` and `@since` tags.
 - Do not add @since tags in src/test classes. Javadoc for these types
   will never be generated or published, and developers can query
   creation date metadata (more accurately) from git for these classes.

Note that in the future--particularly once ethereumj has its own
independent versioning--it will be desirable to use `@since` tags with
version values (for semantic versioning clarity, backward compatibility
analysis and communication, etc). Until then, the `@since DD.MM.YY`
approach will suffice.
2015-01-20 12:14:36 +01:00
Chris Beams a3a180dc59
Revert "Add --debug flag to Travis gradle script config"
This reverts commit 12991a227a.
2015-01-20 12:03:13 +01:00
Roman Mandeleil 79459a47b6 Fix property string 2015-01-20 12:51:29 +02:00
gubatron 858046ec2f init account's ecKey and address, avoid reported NPE 2015-01-19 20:11:23 -05:00
Roman Mandeleil 12991a227a Update .travis.yml 2015-01-19 22:31:46 +02:00
Roman Mandeleil a9b410b38a Fix file encoding for testing 2015-01-19 22:18:14 +02:00
Roman Mandeleil 780f0dce3e Fix test insolation 2015-01-19 20:48:52 +02:00
Roman Mandeleil 3fd0b47b1c Define config for key/val datasource selection 2015-01-19 20:28:56 +02:00
Roman Mandeleil 193f217b81 Connect KeyValueDataSource abstraction to the rest of the application
Repository , Trie implementation and Cache now going to the data through KeyValueDatasource
2015-01-19 19:34:00 +02:00
Roman Mandeleil 38cf19015b Introduce usage of key/val data source as abstraction
Implement Redis  key/val datasource
Implement LevelDb key/val datasource
2015-01-18 23:32:30 +02:00
Roman Mandeleil 5ead5a5da0 Merge pull request #203 from ligi/ligi/code_review/fix_typos_and_cleanup2
remove typos / add missing modifiers / code cleanup
2015-01-18 23:22:49 +02:00
ligi 0c96950e0e remove typos / add missing modifiers / code cleanup 2015-01-18 19:25:06 +01:00
Roman Mandeleil d097a56644 Introduce onHandShakePeer() callback will expose HelloMessage 2015-01-16 10:46:29 +02:00
Roman Mandeleil c7638c2617 Introduce getChannel() by peerId 2015-01-16 10:46:28 +02:00
Roman Mandeleil bbb9e9e303 Add onHandShakePeer() to EthereumListener 2015-01-16 10:46:28 +02:00
Roman Mandeleil c89e591d9e Merge pull request #201 from Bitcoinzie/patch-1
Update README.md
2015-01-15 17:37:33 +02:00
Roman Mandeleil 84e62f700f Merge pull request #202 from Bitcoinzie/patch-2
Adjust properties for poc-8
2015-01-15 17:37:27 +02:00
Bitcoinzie 03a25e841c Adjust properties for poc-8 2015-01-15 01:04:25 -08:00
Roman Mandeleil db413d3496 Merge pull request #199 from ligi/ligi/code_review/fix_typos_and_cleanup
fix some typos  and do some cleanup
2015-01-15 09:24:51 +02:00
Bitcoinzie 3056dcab92 Update README.md
Changed snapshot version number to reflect poc-8 changes
2015-01-14 22:30:21 -08:00