Commit Graph

1055 Commits

Author SHA1 Message Date
Shams Asari
654dc3f60a Resuming from checkpoints now working - seller (but not buyer) in trader demo can be restarted 2016-06-06 17:49:40 +01:00
Rick Parker
1a1efd9523 Merged in cor-133-serialization-tokenization-of-services-1 (pull request #111)
Have ServiceHub entries implement SerializeAsToken so they are not copied into protocol checkpoints.
2016-06-06 17:00:09 +01:00
rick.parker
8122e35a8a Have ServiceHub entries implement SerializeAsToken so they are not copied into protocol checkpoints. 2016-06-06 16:55:46 +01:00
Ross Nicoll
d8940ca88c Merged in rnicoll-generic-amount (pull request #122)
Genericise Amount class
2016-06-01 12:04:46 +01:00
Ross Nicoll
d7b367965f Genericise Amount class
Make the Amount class generic so it doesn't have to represent a quantity of a
currency, but can handle other things such as assets as well, or extended detail
(for example a currency-issuer tuple).
2016-06-01 11:58:13 +01:00
Ross Nicoll
fae934e7b0 Merged in rnicoll-cash-move (pull request #120)
Move cash contract into its own package
2016-05-31 17:15:12 +01:00
Ross Nicoll
fc62010da6 Move cash contract into its own package 2016-05-31 17:07:36 +01:00
Ross Nicoll
93832457e4 Merged in rnicoll-cash-sum-tests (pull request #118)
Add unit tests covering cash sum methods
2016-05-31 15:47:49 +01:00
Mike Hearn
1e0844ccb5 Merged in fix-affinityexecutor-test (pull request #117)
Attempt to fix AffinityExecutorTest and fix an IDE hint.
2016-05-31 15:56:10 +02:00
Mike Hearn
2fa939d50e Merged in docs-release-process (pull request #115)
Docsite: more info on how to cut a release.
2016-05-31 15:54:01 +02:00
Andrius Dagys
b4ee6a09da Merged in trader-demo-fix (pull request #121)
Trader demo fix: buyer now records completed transactions and doesn't attempt to reuse the same spent cash states
2016-05-31 14:36:34 +01:00
Ross Nicoll
ee5088066c Add unit tests covering cash sum methods 2016-05-31 14:21:29 +01:00
Andrius Dagys
4a79600653 Trader demo fix: buyer now records completed transactions and doesn't attempt to reuse the same spent cash states. 2016-05-31 12:40:53 +01:00
Richard Green
e313beb40a updated JIRA link in README.md (from kanban to sprint) 2016-05-25 15:14:44 +01:00
Mike Hearn
3974f7b632 Fix the .gitignore file for the internal repo 2016-05-25 13:05:26 +02:00
Mike Hearn
fac38e1f3f Attempt to fix AffinityExecutorTest and fix an IDE hint.
This test sometimes fails on Jenkins but I can't reproduce the failure here. There is a race in the tests though, I think this should fix it.
2016-05-25 12:27:57 +02:00
Richard Green
6bcd9038c5 update JIRA reference 2016-05-25 10:58:08 +01:00
Mike Hearn
bb8944ab17 Docsite: more info on how to cut a release.
In future this will get more complicated as we make the code know its own version, etc. But for now it'll do.
2016-05-25 11:52:16 +02:00
Ross Nicoll
f7c0756526 Add a dummy test to NonEmptySetTest.Guava
Add a dummy test so that when IntelliJ (incorrectly) scans NonEmptySetTest.Guava
looking for tests, it finds one and doesn't complain.
2016-05-25 10:17:02 +01:00
Ross Nicoll
e3727a1de6 Merged in rnicoll-base58-tests (pull request #113)
Port Base58Test to Kotlin
2016-05-24 18:20:56 +01:00
Rick Parker
570dc38423 Merged in cor-133-clock-helpers (pull request #112)
MutableClock for testing, simulation and demos plus associated utilities
2016-05-24 17:58:37 +01:00
rick.parker
7982902e38 Added comment about use of Semaphore and CountDownLatch 2016-05-24 16:27:39 +01:00
Ross Nicoll
a71c5ea2ff Merged in rnicoll-non-empty-set (pull request #109)
Add NonEmptySet
2016-05-24 15:53:55 +01:00
Ross Nicoll
4744740913 Add NonEmptySet
Add a new set-like collection which is constrained to ensure it's never
empty.
2016-05-24 15:39:24 +01:00
rick.parker
4c75effe8c First phase of updates based on feedback 2016-05-24 14:44:09 +01:00
Ross Nicoll
40b6b0d186 Port Base58Test to Kotlin 2016-05-24 14:20:53 +01:00
Mike Hearn
4065cb25c0 Regen docsite 2016-05-24 13:48:53 +02:00
Mike Hearn
eabffb7fda Docsite: fix minor issues in the running-the-demos page 2016-05-24 13:48:35 +02:00
Mike Hearn
b6c3359cde Docs: regen docsite 2016-05-24 13:27:23 +02:00
Mike Hearn
68824e9d7e Docsite: added a release notes page 2016-05-24 13:27:16 +02:00
rick.parker
0b2c16be67 Changes to packages after refactor 2016-05-24 11:48:04 +01:00
rick.parker
f8e610aa71 Re-apply changes 2016-05-24 09:41:00 +01:00
Mike Hearn
1e9f97f890 Docs: regen docsite for new where to start page. 2016-05-23 18:54:38 +02:00
Mike Hearn
1877491a9a Merged in full-scenario-tutorial-doc (pull request #105)
Docs: add a doc that describes how to link the other tutorials together into a demo.
2016-05-23 18:54:09 +02:00
Mike Hearn
8488e4d3ff Regen docsite 2016-05-23 18:05:37 +02:00
Mike Hearn
fffeb4caa9 Docs: fix a typo that caused a parse failure. 2016-05-23 18:03:31 +02:00
Matthew Nesbit
725581ef02 Merged in mnesbit-cor-174-add-r3corda-namespace (pull request #110)
Add com.r3corda to namespaces
2016-05-23 15:55:07 +01:00
Matthew Nesbit
8024f015b3 Fixup dokka path to pickup new locations of modules 2016-05-23 15:34:00 +01:00
Matthew Nesbit
3a27ca5989 Correct main application class name 2016-05-23 15:20:20 +01:00
Matthew Nesbit
ab5fc4a1d5 Fix up default IntelliJ run configuration 2016-05-23 15:10:45 +01:00
Matthew Nesbit
63a5fd1b9e Add com.r3corda to all namespaces. 2016-05-23 14:53:56 +01:00
Matthew Nesbit
4eb4233584 Merged in mnesbit-cor-174-refactor-namespaces (pull request #108)
Further refactoring of namespaces and tidy up of unit test locations
2016-05-20 18:15:18 +01:00
Matthew Nesbit
d1e8d15d9d Merge branch 'mnesbit-cor-174-refactor-namespaces' of https://bitbucket.org/R3-CEV/r3prototyping into mnesbit-cor-174-refactor-namespaces
# Conflicts:
#	core/src/main/kotlin/core/testing/TestUtils.kt
2016-05-20 16:56:41 +01:00
Matthew Nesbit
1d5f409c66 Remove unnecessary .Companion statements brought in during refactoring. 2016-05-20 16:43:03 +01:00
Matthew Nesbit
45f67a4f8c Remove orphaned comment 2016-05-20 16:43:02 +01:00
Matthew Nesbit
60ff42dd30 Move test to core as part of tidy up. 2016-05-20 16:43:02 +01:00
Matthew Nesbit
69cba98ddc Push unit tests that needed some contract functionality into core by embedding the minimal contract support needed. 2016-05-20 16:43:02 +01:00
Matthew Nesbit
a7c0296f6b Rename node.core to node.internal from Rick's suggestion not to use core outside of the core package. 2016-05-20 16:43:01 +01:00
Matthew Nesbit
8e9055b907 Kill test resource file that didn't move correctly 2016-05-20 16:43:00 +01:00
Matthew Nesbit
f6f56797ce Refactor code into clear core, contracts and node namespaces. Move services into clear implementation and api sides. Push unit tests down to lowest level of dependency hierarchy possible. 2016-05-20 16:42:59 +01:00