Commit Graph

237 Commits

Author SHA1 Message Date
3a92bab9ba Merge remote-tracking branch 'origin/develop' into feature/nio 2016-08-17 07:46:52 +02:00
1eac644813 Fixed error in AbstractMessageRepository (archived messages couldn't be found) 2016-08-15 11:52:43 +02:00
41c4447514 Automatically set version from git
- Uses last tag on master branch (this is set on 'git flow release finish')
- branch name snapshot otherwise, e.g. 'feature-nio-SNAPSHOT', 'develop-SNAPSHOT'

(cherry picked from commit 86cfc66a40)
2016-08-12 22:02:06 +02:00
631e71bc74 Updated gradle
(cherry picked from commit 52422d3)
2016-08-12 21:58:36 +02:00
86cfc66a40 Automatically set version from git
- Uses last tag on master branch (this is set on 'git flow release finish')
- branch name snapshot otherwise, e.g. 'feature-nio-SNAPSHOT', 'develop-SNAPSHOT'
2016-08-12 16:27:57 +02:00
52422d3398 Updated gradle 2016-08-12 11:04:04 +02:00
cd3a801704 Used wrong nonce for version message 2016-08-09 19:50:11 +02:00
505818a712 Added option to connect to local Bitmessage client
(This makes it easier to debug some problem or make some tests)
2016-08-08 18:00:50 +02:00
92229151a5 It seems travis is a bit slow sometimes, so I raised the timeout for the NetworkHandlerTest 2016-07-29 11:47:05 +02:00
334a510743 Fixes, improved tests and other improvements 2016-07-29 07:49:53 +02:00
56ebb7b8fa Better memory management for the out buffer 2016-07-27 07:38:39 +02:00
48ff975ffd Better memory management for the in buffer (the same TODO for the out buffer. 2016-07-25 07:52:27 +02:00
82ee4d05bb Raised test timeout, as the Jacoco run seems to be considerably slower. 2016-07-10 06:55:24 +02:00
50f2c7e080 Fixed synchronisation 2016-07-09 16:37:12 +02:00
d130080df2 Implemented methods offer and request, system test works now but synchronization is still broken. 2016-07-08 18:14:41 +02:00
abc2f63aa6 Some further fixes and improvements, not all tests working yet 2016-06-20 16:33:47 +02:00
ae2120675f Tests with NioNetworkHandler as peer work now 2016-06-18 23:09:23 +02:00
0fadb40c6c Improved tests and fixed some 2016-06-16 19:47:59 +02:00
ed4fd1002b Improved uint reading 2016-06-12 20:53:05 +02:00
62d40fb2c3 Improved unsigned byte comparison 2016-06-12 20:43:23 +02:00
12fb794203 Minor test improvements 2016-06-09 17:46:21 +02:00
cde4f7b3ce Some refactoring to move some common code into an AbstractConnection 2016-06-01 17:38:49 +02:00
425a9dd6bf Merge branch 'develop' into feature/nio 2016-05-28 11:05:39 +02:00
c1fa642b4e Made tests more stable, albeit slightly slower 2016-05-28 11:04:47 +02:00
08f2d5d6f1 Added write(ByteBuffer) to Streamable interface and a first draft for a NioNetworkHandler 2016-05-28 10:22:47 +02:00
b8f88b02d1 Improved tests 2016-05-26 22:50:37 +02:00
5c4892d153 Added test 2016-05-26 06:55:31 +02:00
3d2cea91ce Merge branch 'feature/ACK' into develop 2016-05-24 19:36:41 +02:00
22108527f3 Minor update to the README file 2016-05-24 19:35:41 +02:00
725d2b848e Fixed migration and added resend and cleanup options to demo application 2016-05-24 17:19:29 +02:00
409dccd0be Fixed broken JavaDoc and removed unused import 2016-05-24 07:45:34 +02:00
ed6344c662 Added BitmessageContext method to resent unacknowledged messages and updated README.md 2016-05-23 20:11:44 +02:00
14849a82ea Refactored JdbcMessageRepository so that alternative implementations can be done easier 2016-05-20 23:58:08 +02:00
c3d8a07e83 Added unit tests and fixed bug 2016-05-20 23:00:27 +02:00
43f42dd400 This breaks a lot of things, but it seems necessary. Implemented the resending mechanism and fixed many problems on the way, but tests and triggers are still to do. 2016-05-20 07:32:41 +02:00
e44dd967d0 Test for NodeRegistry 2016-05-13 12:25:04 +02:00
a67ac27921 Fixed yet another test 2016-05-10 07:26:25 +02:00
05d9ea93d2 Acknowledgments are now returned, received, and the message (Plaintext object) updated
-> no logic to resend messages yet
2016-05-06 19:39:39 +02:00
de8f04e22a Added warning to Labeler for developers who want to implement it. 2016-05-06 17:29:39 +02:00
4f0b2cb8f8 Fixed system test (this time for real) 2016-05-06 14:13:39 +02:00
678a48ac3f Fixed system test and ProofOfWorkService 2016-05-05 10:50:22 +02:00
c7594795f0 Fixed tests & bugs, removed Ack payload type (a GenericPayload is now used)
- SystemTest don't work yet, sending messages seems broken
- ProofOfWorkService needs some work, the current solution is a hack (and might be the reason above tests are broken)
2016-05-02 11:11:29 +02:00
ea2cd7bf53 Improved labeler to cover all cases, and fixed when labels are set while sending (outbox vs sent)
Removed message callback with both didn't work and is obsolete (use a labeler descendant)
2016-04-29 15:29:22 +02:00
8df42a6cf0 Merge branch 'develop' into feature/ACK
# Conflicts:
#	core/src/main/java/ch/dissem/bitmessage/BitmessageContext.java
2016-04-28 19:32:21 +02:00
784b192bab Simplyfied MultiThreadedPOWEngine and thread pool creation 2016-04-28 07:15:48 +02:00
a0505f5704 Minor improvements to the demo Application and a fix for when the ACK is empty 2016-04-25 08:13:46 +02:00
61890b3da9 Some improvements to the application 2016-04-15 17:18:11 +02:00
ddd5826f42 Fixed feature bitfield calculation/resolution 2016-04-13 07:32:35 +02:00
c31ec7a9e5 Fixed problems after merging 2016-04-12 17:27:19 +02:00
6f4f51aef3 Merge branch 'develop' into feature/ACK
# Conflicts:
#	core/src/main/java/ch/dissem/bitmessage/DefaultMessageListener.java
#	core/src/main/java/ch/dissem/bitmessage/InternalContext.java
#	core/src/main/java/ch/dissem/bitmessage/entity/BitmessageAddress.java
#	core/src/main/java/ch/dissem/bitmessage/entity/Plaintext.java
2016-04-11 23:41:23 +02:00