Commit Graph

1835 Commits

Author SHA1 Message Date
Clinton Alexander
1458c3ac1f Finished implementing view for create deal. 2016-07-12 10:27:36 +01: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
Clinton Alexander
6b165c562e Further simplified interface by removing the multi currency support. 2016-07-11 15:34:18 +01: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
Clinton Alexander
304b5ae40c Added colours to deals. Removed generated and derived fields from the create deal page. 2016-07-11 15:00:17 +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
Andras Slemmer
dae39bbfc1 docs: Add tutorial on the test DSL 2016-07-11 14:25:27 +01:00
Andras Slemmer
9bb8439dc3 testdsl: Add failsWith to Ledger 2016-07-11 14:25:27 +01:00
Andras Slemmer
cd0299f650 testdsl: Javadoc comments 2016-07-11 14:25:27 +01:00
Andras Slemmer
3d885eb928 testdsl: Clean up TestUtils.kt 2016-07-11 14:25:27 +01:00
Andras Slemmer
c3060c11c0 testdsl: Use and expose TransactionBuilder in TestTransactionDSLInterpreter 2016-07-11 14:25:27 +01:00
Andras Slemmer
656b06f7f5 Merged in docs-build-script (pull request #213)
docs: Add build_docs.sh
2016-07-11 14:24:21 +01:00
Andras Slemmer
7491503a10 docs: .gitignore docs/virtualenv 2016-07-11 14:00:51 +01:00
Andras Slemmer
8ca73e51d4 docs: Add build_docs.sh 2016-07-11 12:17:18 +01:00
Clinton Alexander
5e47ba88d1 Removed more fields. Selects reintroduced. 2016-07-11 11:50:31 +01:00
Ross Nicoll
8264e771f5 Merged in rnicoll-contract-minor (pull request #211)
Preparation work for contract clauses
2016-07-11 11:36:45 +01:00
Ross Nicoll
0404ef4f62 Standardise error messages regarding state issuance
This makes the error messages when verifying state issuance consistent between
Cash, CommercialPaper and Obligation contracts, in preparation for introducing
a common issue clause between the contracts.
2016-07-11 11:32:36 +01:00
Ross Nicoll
7655356ec2 Minor: Remove unneeded backquotes 2016-07-11 11:32:34 +01:00
Ross Nicoll
ae1d3e96b1 Extend obligation tests to cover input lifecycle checks 2016-07-11 11:30:36 +01:00
Clinton Alexander
89e8708e76 Date change now works first time for changing a single day. 2016-07-11 10:19:40 +01:00
sofusmortensen
07c1f8b86a Merge branch 'master' into sofus-generic-contract 2016-07-10 15:28:21 +02:00
sofusmortensen
f0fc8f414f cleanup, testing rollout syntax 2016-07-10 12:12:33 +02:00
Clinton Alexander
914e6cf52c Fixed minor bug in the date changer. 2016-07-08 16:41:23 +01:00
Clinton Alexander
230e230448 Removed debugging code. 2016-07-08 16:41:23 +01:00
Clinton Alexander
a147385255 Refactored project to use require.js to separate out modules more cleanly. 2016-07-08 16:41:23 +01:00
Clinton Alexander
3a614478ba App now loads reliably. 2016-07-08 16:41:23 +01:00
Clinton Alexander
dc0658f56e App now loaded via requirejs. 2016-07-08 16:41:23 +01:00
Clinton Alexander
ef4273e0d0 Fixed rate now submitted correctly. 2016-07-08 16:41:23 +01:00
Clinton Alexander
742200d781 Fixed issues arising from API changes. 2016-07-08 16:41:23 +01:00
Clinton Alexander
f3e0a0c0be Fixed error in submitting the a new deal via web form. 2016-07-08 16:41:23 +01:00
Clinton Alexander
208205e7f4 Fixed minor merge conflict. 2016-07-08 16:41:23 +01:00
Clinton Alexander
4c8045d4da Moved webdemo into more appropriate folder. 2016-07-08 16:41:23 +01:00