Commit Graph

795 Commits

Author SHA1 Message Date
cae39332bf Remove commented out ResolveTransactionsProtocol call as it is not required 2016-06-16 13:15:37 +01:00
f831ffdf3d Add tests for TransactionGraphSearch 2016-06-15 16:21:53 +01:00
aa153be6f0 moved methods in ChildrenProgressTrackers into ProgressTracker 2016-06-14 16:42:42 +01:00
2ce0dce0aa . 2016-06-14 11:28:58 +01:00
86203709c0 Payment dates now are calculated as an offset to the period end date 2016-06-13 19:00:27 +01:00
73cbab0084 Pull out Wallet observable into it's own branch
Review feedback

Review feedback

Apply feedback from previous PR

Apply feedback from previous PR

Apply feedback from previous PR

PR feedback

PR feedback

PR feedback
2016-06-10 17:16:56 +01:00
2365f9bca5 Persisting transactions to disk 2016-06-08 10:15:14 +01:00
97e04ba7d0 Fix registration of services due to Kryo not following synthetic fields by default
Review feedback
2016-06-07 16:29:59 +01:00
21f53a7d3e Revert "Revert "Merged in validating-notary (pull request #123)""
This reverts commit e64145991e.
2016-06-07 13:53:00 +01:00
f4f0e160d2 Genericise Cash contract to support non-Currency things
Split the verification and commands for the Cash contract into a new AbstractCashLike
class, and make Cash a concrete implementation of that class, specialised for dealing
with Currency as the underlying token.
2016-06-07 13:49:26 +01:00
e64145991e Revert "Merged in validating-notary (pull request #123)"
This reverts commit d9f4e4da2e, reversing
changes made to 654dc3f60a.
2016-06-07 12:29:27 +01:00
c45bc0df20 Split up Notary protocol into Client and Service parts. The Service protocol can be extended to provide additional transaction processing logic, e.g. validation.
Implemented a Simple and Validating Notary services.
2016-06-07 10:58:34 +01:00
654dc3f60a Resuming from checkpoints now working - seller (but not buyer) in trader demo can be restarted 2016-06-06 17:49:40 +01:00
8122e35a8a Have ServiceHub entries implement SerializeAsToken so they are not copied into protocol checkpoints. 2016-06-06 16:55:46 +01:00
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
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
e3727a1de6 Merged in rnicoll-base58-tests (pull request #113)
Port Base58Test to Kotlin
2016-05-24 18:20:56 +01:00
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
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
40b6b0d186 Port Base58Test to Kotlin 2016-05-24 14:20:53 +01:00
f8e610aa71 Re-apply changes 2016-05-24 09:41:00 +01:00
63a5fd1b9e Add com.r3corda to all namespaces. 2016-05-23 14:53:56 +01:00
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
1d5f409c66 Remove unnecessary .Companion statements brought in during refactoring. 2016-05-20 16:43:03 +01:00
60ff42dd30 Move test to core as part of tidy up. 2016-05-20 16:43:02 +01:00
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
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
a556dfb17d Push internal subsystems into node 2016-05-20 16:42:56 +01:00
06f4c6ab5b Move test to core as part of tidy up. 2016-05-19 14:10:25 +01:00
097a520e05 Push unit tests that needed some contract functionality into core by embedding the minimal contract support needed. 2016-05-19 14:01:38 +01:00
01e9536444 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-19 10:59:10 +01:00
c8130581a9 Push internal subsystems into node 2016-05-19 10:59:07 +01:00
041aab5af0 Serialization tokenization support for large objects (e.g. entries in ServiceHub) 2016-05-18 10:25:50 +01:00
e8ae3be38d TwoPartyDealProtocol fix: don't check Notary identity if the transaction has no inputs 2016-05-18 10:06:30 +01:00
4affe7271b Seller: Verify that the Notary signature received from the Buyer is by the correct Notary 2016-05-17 12:14:14 +01:00
f363439a6c NotaryException now provides the specific error information 2016-05-17 12:14:14 +01:00
058ac986bd Move contracts base files to namespace to make api aspect clearer in includes.
Move Party to core.crypto as Party is closely aligned with the signing and used in code areas unrelated to the contract code.
2016-05-14 13:47:07 +01:00
422d65cc54 Rearranging interfaces and implementations. Notary fix for the cash tests. 2016-05-13 16:34:25 +01:00
2c422bebd3 Added noneOrSingle extension method, which returns a single element, null if no elements found and throws if more than one element found 2016-05-13 16:17:50 +01:00
fa3f7e7fa6 Added a basic Notary service with protocol for signing transactions 2016-05-13 16:17:50 +01:00
539e23a0b1 Merged in plt-141-moves-only-part-3 (pull request #93)
File and interface moves to core module for scheduler
2016-05-13 15:17:32 +01:00
25e2c4bc4d Add issuance definition for cash contract
Add issuance definition for cash contract, as well as common interfaces to support later
extensions. The issuance definition encapsulates the core values for state objects when
issued, and essentially acts as the Ricardian contract for Corda states.
2016-05-13 14:55:12 +01:00
030f12876f Remove copyright notices from a couple of files 2016-05-13 14:12:28 +01:00
1ce8a64938 File and interface moves to core module 2016-05-13 14:03:28 +01:00
3ee601360e Merged in plt-141-moves-only-part-2 (pull request #92)
File moves to core module and split of interfaces and implementations in preparation for further moves
2016-05-13 13:22:08 +01:00
e319a33b52 Added TODO to ServiceHub and CheckpointStorage 2016-05-13 12:37:39 +01:00
81c698a260 Minor: fix some compiler warnings 2016-05-13 12:58:17 +02:00
6017179bc0 File moves to core module and split of interfaces and implementations in preparation for further moves 2016-05-13 11:35:45 +01:00
a18e7b06bf File moves to core module and split of interfaces and implementations in preparation for further moves 2016-05-13 10:07:44 +01:00
2d4c83556e Annotate verify() function to indicate it throws IllegalArgumentException 2016-05-09 18:16:33 +01:00