Commit Graph

774 Commits

Author SHA1 Message Date
Ross Nicoll
f9c1f31730 Merged in rnicoll-transaction-graph-search (pull request #149)
Add tests for TransactionGraphSearch
2016-06-15 16:22:23 +01:00
Ross Nicoll
f831ffdf3d Add tests for TransactionGraphSearch 2016-06-15 16:21:53 +01:00
Rick Parker
07153578f0 Merged in fix-clockutils-suspendable (pull request #150)
node: add missing @Suspendable
2016-06-15 16:05:10 +01:00
Andras Slemmer
3d109252f5 node: add missing @Suspendable 2016-06-15 15:16:08 +01:00
Clinton Alexander
8aa6fa156a Merged in removecrowdfundcontract (pull request #147)
Removed the CrowdFund contract since it is written in a style that is not typical of Corda contracts.
2016-06-15 14:53:47 +01:00
Rick Parker
cba76bb0f4 Merged in quasarScan-warning-fix (pull request #143)
Remove quasar scan related warnings of suspendable supers outside our project (in kotlin stdlib).
2016-06-15 14:31:43 +01:00
rick.parker
b595b23ed7 Remove quasar scan related warnings of suspendable supers outside our project (in kotlin stdlib).
Suppressed two compiler warnings related to unused variables (seems to be compiler bug)
2016-06-15 14:30:00 +01:00
Clinton Alexander
7e15445ee9 Removed the CrowdFund contract since it is written in a style that is not typical of Corda contracts. 2016-06-15 12:32:36 +01:00
Shams Asari
853bc683f8 Simplify last checkpoint removal race condition fix 2016-06-15 10:01:33 +01:00
Shams Asari
aa153be6f0 moved methods in ChildrenProgressTrackers into ProgressTracker 2016-06-14 16:42:42 +01:00
Richard Green
fdd8446b29 Merged in rg_todo_irs_676 (pull request #140)
Two TODOs in IRS - about calculating the actual payment date as an offset
2016-06-14 16:37:06 +01:00
Richard Green
3ab3955213 . 2016-06-14 11:57:55 +01:00
Richard Green
2ce0dce0aa . 2016-06-14 11:28:58 +01:00
Richard Green
86203709c0 Payment dates now are calculated as an offset to the period end date 2016-06-13 19:00:27 +01:00
Ross Nicoll
a25b69aa8e Merged in rnicoll-library-docs (pull request #130)
Add documentation of transaction data types
2016-06-13 18:22:39 +01:00
Andras Slemmer
71cbea46e3 Merged in R3-CEV/internal/simulation-changes (pull request #137)
Simulation changes
2016-06-13 18:10:01 +01:00
Andras Slemmer
56821c3a24 node: rename _networkMapRegistrationSettableFuture to _networkMapRegistrationFuture 2016-06-13 18:09:38 +01:00
Andras Slemmer
16465ba475 node: prefix private field with '_', use get() = 2016-06-13 18:09:38 +01:00
Andras Slemmer
50cd3c938a node: hide writable networkMapRegistrationSettableFuture 2016-06-13 18:09:38 +01:00
Andras Slemmer
0dda3b2473 node: wait for last checkpoint remove before completing state machine future, fixes race in TwoPartyTradeProtocolTests 2016-06-13 18:09:38 +01:00
Andras Slemmer
fe83e41f52 node: use star projection instead of useless transform to hide type param 2016-06-13 18:09:38 +01:00
Andras Slemmer
5525487169 node: remove debug println 2016-06-13 18:09:38 +01:00
Andras Slemmer
3bf95429e9 node: change InMemoryMessagingNetwork so that the exposed allMessages stream is in sync with iterate() 2016-06-13 18:09:38 +01:00
Andras Slemmer
53bd5c2287 node: make AbstractNode's networkMapRegistrationFuture non-nullable 2016-06-13 18:09:38 +01:00
Ross Nicoll
76a5328e4b Replace TokenDefinition with Issued 2016-06-13 17:39:42 +01:00
Ross Nicoll
a96a05d857 Add note about party type being likely to change 2016-06-13 17:38:18 +01:00
Ross Nicoll
92b25af092 Clarified contents of WireTransaction 2016-06-13 17:38:18 +01:00
Ross Nicoll
14463266db Add definition of state interfaces 2016-06-13 17:38:18 +01:00
Ross Nicoll
4b39ab0357 Clear up wording around how the FungibleAsset superclass is used
Clear up wording around how the FungibleAsset superclass is used, and in particular
that it contains contract code, but provides an interface that should be extended by
subclass state objects.
2016-06-13 17:38:18 +01:00
Ross Nicoll
8d1ac66787 Remove Business Calendar header 2016-06-13 17:38:18 +01:00
Ross Nicoll
874892df93 Move fungible definition up the document 2016-06-13 17:38:18 +01:00
Ross Nicoll
fc3bc163aa Tweak wording (state -> states) 2016-06-13 17:38:18 +01:00
Ross Nicoll
9cdcaaa606 Add documentation of transaction data types 2016-06-13 17:38:18 +01:00
Richard Green
8ea8ec435e Merged in rg_todo_irs_utils_41 (pull request #138)
Change to the comments that we have discussed the possibility of allowing code such as 0.1.percent
2016-06-13 16:25:43 +01:00
Richard Green
12f3e4802c Change to the comments that we have discussed the possibility of allowing code such as 0.1.percent 2016-06-13 16:24:49 +01:00
Rick Parker
58d5162782 Merged in cor-133-observable-wallet (pull request #135)
Pull out Wallet observable into it's own branch
2016-06-10 17:18:46 +01:00
rick.parker
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
Rick Parker
d9ad1b78ef Merged in cor-133-observable-smm (pull request #134)
Pull out StateMachineManager observable into it's own branch
2016-06-10 13:11:47 +01:00
rick.parker
82abc69046 Pull out StateMachineManager observable into it's own branch
Review feedback

Review feedback

Review feedback
2016-06-10 13:10:56 +01:00
Clinton Alexander
ff467beaec Merged in irsdemowindows (pull request #125)
IRS Demo support on Windows - Replaced shell scripts with Kotlin demo runner.
2016-06-09 09:59:53 +01:00
Clinton Alexander
28c6df2440 IRSDemo is now fixed. Merge conflict caused notary types to become mismatched. Merged the new file upload code from the irsdemotest branch. 2016-06-08 18:45:34 +01:00
Clinton Alexander
2b64ba1cc6 Fixed IRS demo success case for PUT requests. 2016-06-08 16:45:19 +01:00
Clinton Alexander
146f274dd0 Demo now requires the setup steps if the configuration is not default. Documentation updated to reflect these changes. 2016-06-08 16:31:58 +01:00
Clinton Alexander
7b2214e888 IRS Demo config is now able to be run in any order if default directory settings are present. 2016-06-08 16:31:58 +01:00
Clinton Alexander
8010836f14 Added setup steps to the IRSDemo to make steps more explicit and tidied up the handling of args. 2016-06-08 16:31:58 +01:00
Clinton Alexander
782d50958d IRS demo endpoints are now parameterised for the Trade and Demo modes. Documentation fixes. 2016-06-08 16:30:40 +01:00
Clinton Alexander
0c94637685 Documentation now has separate Windows instructions for running the demos. 2016-06-08 16:30:40 +01:00
Clinton Alexander
6b62f33c46 Corrected the currency mismatch in the example trade. 2016-06-08 16:30:40 +01:00
Clinton Alexander
9e32d62d0f Moved resource files for IRSDemo from scripts to resource directory. Removed errant semicolons. 2016-06-08 16:29:21 +01:00
Clinton Alexander
32a5d4173a IRS demo now requires no manual configuration. All functions made private. 2016-06-08 16:29:21 +01:00