Commit Graph

1128 Commits

Author SHA1 Message Date
Matthew Nesbit
d07db80461 Repair broken RateFixDemo code and script 2016-07-13 11:28:54 +01:00
Matthew Nesbit
9d18234383 Consistently use an sl4j logger with timestamp, rather than console println within the node. Note that the current protocol events published via the ProgressTracker are sent to the console without a timestamp. 2016-07-13 11:28:52 +01:00
Mike Hearn
ead19c619a Merged in mike-cp-issuance-fix (pull request #224)
Disentangle the concept of CP issuer vs underlying redeemable asset issuer in the CP contract.
2016-07-13 11:13:23 +02:00
Ross Nicoll
229b0ce0bc Merged in rnicoll-cleanup (pull request #228)
Cleanup
2016-07-13 09:56:52 +01:00
Ross Nicoll
15bc48b49b Minor: Add note about refactoring TwoPartyTradeProtocol 2016-07-12 18:42:36 +01:00
Ross Nicoll
254592dc54 Move protocols into correct package 2016-07-12 18:42:00 +01:00
Ross Nicoll
27241fb10a Rebuild documentation 2016-07-12 17:52:52 +01:00
Ross Nicoll
a914b12a11 Merged in rnicoll-clause-docs (pull request #219)
Add documentation on contract clauses
2016-07-12 17:49:02 +01:00
Ross Nicoll
1943b3633f Add documentation on contract clauses 2016-07-12 17:47:51 +01:00
Andras Slemmer
54042db7bc Merged in demo-cliargs-description (pull request #216)
Demo cliargs description
2016-07-12 15:54:12 +01:00
Andras Slemmer
53725af318 irsdemo: Add spaces in closure 2016-07-12 15:42:28 +01:00
Andras Slemmer
38af91dc48 irsdemo: add --help 2016-07-12 15:42:28 +01:00
Andras Slemmer
6da1a702bf irsdemo: Give descriptions of cli arguments 2016-07-12 15:42:28 +01:00
Andras Slemmer
144f88e0d0 irsdemo: Print more helpful error message when no role is specified (was NPE) 2016-07-12 15:42:28 +01:00
Andras Slemmer
4b962eeb1f irsdemo: Remove unused --fake-trade-with-address 2016-07-12 15:42:28 +01:00
Mike Hearn
f6789c93dd Disentangle the concept of CP issuer vs underlying redeemable asset issuer in the CP contract.
This confusion was introduced by a previous refactoring.
2016-07-12 16:01:50 +02:00
Ross Nicoll
910d1932c9 Merged in rnicoll-commercial-paper-cleanup (pull request #223)
Tweak conditions on JavaCommercialPaper to match CommercialPaper
2016-07-12 14:51:08 +01:00
Ross Nicoll
e09710e421 Update contract tutorial example to match JavaCommercialPaper 2016-07-12 14:48:50 +01:00
Ross Nicoll
52be94866a Use requireThat in JavaCommercialPaper
Replaces verification logic in JavaCommercialPaper, which previously manually
throw IllegalStateException, with calls to requireThat().
2016-07-12 14:24:50 +01:00
Ross Nicoll
79e3ce23f8 Tweak conditions on JavaCommercialPaper to match CommercialPaper 2016-07-12 14:24:50 +01:00
Matthew Nesbit
12d5f01086 Merged in mnesbit-sprint-5-tidyup (pull request #221)
Mnesbit sprint 5 tidyup
2016-07-12 13:48:02 +01:00
Matthew Nesbit
3ed382cd84 Merge remote-tracking branch 'origin/mnesbit-sprint-5-tidyup' into mnesbit-sprint-5-tidyup 2016-07-12 13:44:06 +01:00
Matthew Nesbit
3a5399f878 Remove TODO associated with the fact that the ZIP filesystem does not specify the Path Separator character. Add a test to check access through forward or backward slashes is consistent. 2016-07-12 13:43:44 +01:00
Matthew Nesbit
dba2b980a5 Remove TODO as the usage of CheckpointStorage is only through ServiceHubInternal into the StateMachineManager. We don't restrict access to internal for now as this causes too much other change. 2016-07-12 13:43:43 +01:00
Ross Nicoll
bb294da857 Minor: Correct class name in tutorial
Correct a reference to "Cash" in the tutorial, is actually "CommercialPaper"
2016-07-12 11:55:52 +01:00
Matthew Nesbit
63f40fd8d4 Remove TODO associated with the fact that the ZIP filesystem does not specify the Path Separator character. Add a test to check access through forward or backward slashes is consistent. 2016-07-12 11:53:50 +01:00
Matthew Nesbit
2f4c0e9ae5 Remove TODO as the usage of CheckpointStorage is only through ServiceHubInternal into the StateMachineManager. We don't restrict access to internal for now as this causes too much other change. 2016-07-12 11:53:49 +01:00
Ross Nicoll
0d78df33f8 Add standard clauses 2016-07-12 11:31:23 +01:00
Sofus Mortensen
027e78be24 Merged in sofus-generic-contract (pull request #218)
Sofus generic contract
2016-07-12 12:00:06 +02:00
sofusmortensen
7b241b6b12 Merge branch 'master' into sofus-generic-contract 2016-07-12 07:47:43 +02:00
sofusmortensen
7284896375 RollOut/Continuation 2016-07-12 07:46:40 +02:00
sofusmortensen
84700ce1b9 Notes 2016-07-12 07:46:17 +02:00
Andras Slemmer
3325758113 Merged in full-stops! (pull request #217)
all: Full stops in comments!
2016-07-11 18:44:08 +01:00
Andras Slemmer
635da20fe2 contracts: Maybe we don't need a full stop there 2016-07-11 18:37:27 +01:00
Andras Slemmer
d7cc34c9a5 all: Full stops in comments! 2016-07-11 17:58:53 +01:00
Mike Hearn
04c6449f92 Merged in mike-small-cleanups (pull request #215)
Small cleanups
2016-07-11 18:50:45 +02:00
Mike Hearn
e28ecae8c0 Address review comments 2016-07-11 18:47:24 +02:00
Mike Hearn
2be91ff516 Minor: tighten variance when possible (via the Inspector) 2016-07-11 18:15:28 +02:00
Mike Hearn
0a2f313d40 Minor: run IntelliJ 'code cleanup' 2016-07-11 18:15:28 +02:00
Mike Hearn
41d092a169 Minor: optimize imports 2016-07-11 18:15:28 +02:00
Mike Hearn
6b7580c977 Minor: fix compiler warnings. 2016-07-11 18:15:28 +02:00
Mike Hearn
190c5334bb Merged in mike-testing-cleanup (pull request #214)
Testing cleanup
2016-07-11 18:14:46 +02:00
Mike Hearn
cc22810b09 Testing cleanup:
- Move code out of ambiguously named TestUtils files (there were three). Sometimes it's simpler to just put these things into the contract source files directly.
- Remove JavaTestHelpers objects (there were three), in favour of just giving the top level kotlin file class better names.
- Misc other small tweaks and cleanups.
2016-07-11 16:22:02 +02:00
Ross Nicoll
2cd5014941 Merged in rnicoll-timestamping-notary-take2 (pull request #206)
Replace named timestamping authority with notary
2016-07-11 15:00:35 +01:00
Ross Nicoll
6b775ebd4d Replace named timestamping authority with notary
As the timestamping authority is now always the notary service, contracts should
no longer be using name-based lookup of the timestamping authority (as this will
generally be wrong). This introduces a new "timestamp" property on a transaction,
and updates most contracts to refer to it.

In some cases (IRS, CommercialPaper) there are transactions with no input states
to derive notary from, that use timestamps. In these cases a notary is specified
in the command.
2016-07-11 14:54:36 +01:00
Andras Slemmer
ae2e6ab917 Merged in test-dsl-docs (pull request #212)
Test dsl docs
2016-07-11 14:31:35 +01:00
Andras Slemmer
d0903ae265 docs: Rename test tutorial subtitle 2016-07-11 14:25:27 +01:00
Andras Slemmer
e13a95857a core: Remove colons from @param comments 2016-07-11 14:25:27 +01:00
Andras Slemmer
4324e33fea testdsl: Removed R type parameter, unify verifies() interface 2016-07-11 14:25:27 +01:00
Andras Slemmer
fb55ceeb79 contracts: Remove Tmp* files 2016-07-11 14:25:27 +01:00