Commit Graph

4075 Commits

Author SHA1 Message Date
a68e546f81 renamed contract/kontract to arrangement, renamed observable to perceivable in order to prevent conflicts/misunderstandings with rest of Corda 2016-06-27 00:04:47 +02:00
10b17d6862 Merged in java-test-dsl (pull request #181)
Java test DSL
2016-06-24 18:53:02 +01:00
47decb3bbe coree: Expose MOCK_IDENTITY_SERVICE as MockIndentityService instead of IdentityService 2016-06-24 18:33:53 +01:00
5973725186 core: Make top-level side-effecting getters lazy instead 2016-06-24 18:33:21 +01:00
10d8f5cd06 core: Add comment on how to define globals for the Java test DSL 2016-06-24 16:37:43 +01:00
bc326660a3 contracts, core: Fix static init cycle issue of JavaTestHelpers 2016-06-24 16:37:43 +01:00
341adafd3a contracts, core: Rename Java to JavaTestHelpers 2016-06-24 16:37:43 +01:00
040e51ec12 contracts, core: Expose top-level DSL values/functions to Java by wrapping them in an object
core: Add overloads for convenient Java interop

contracts, core: Uniform Java interop for tests, use camelCase
2016-06-24 16:37:43 +01:00
28e85923a3 core: Add CashTestsJava.java, containing some of CashTests.kt in Java 2016-06-24 16:37:43 +01:00
bec1ab7a7e core: Add javadoc on how to be Java-compatible with the Kotlin DSL 2016-06-24 16:37:43 +01:00
6109065dee core: Use LastLineShouldTestForAcceptOrFailure trick on rejects() 2016-06-24 16:37:43 +01:00
2dfcff1f31 Testing: Fix the wallet filler code. 2016-06-24 17:13:27 +02:00
1b72feff7a Testing: Fix the wallet filler code. 2016-06-24 14:57:24 +02:00
8b24acf69e Merged in temporary-fix-inmemory-wallet-thread-clash (pull request #184)
Temporary fix inmemory wallet thread clash
2016-06-23 18:09:10 +01:00
2d8d5571c2 core: Add more info to ClashingThreads exception 2016-06-23 18:06:57 +01:00
ac69f566c9 node: Add another test testing correct LinearState sequencing 2016-06-23 18:06:57 +01:00
57270c8c66 core: Add nonce to DummyLinearState 2016-06-23 18:06:57 +01:00
6bab0eb79f core: Add comment about Wallet.states 2016-06-23 18:06:57 +01:00
3a84e2fe9d node: Add test for LinearState thread clash 2016-06-23 18:06:57 +01:00
f233780e08 core: Add DummyLinearState and AlwaysSucceedContract for testing 2016-06-23 18:06:57 +01:00
2c7b86fee2 core: Add LinearState thread clash check to InMemoryWalletService.notifyAll 2016-06-23 18:06:57 +01:00
3cc0cef9c5 core: Typo 2016-06-23 18:06:57 +01:00
497fcabd4d Merged in notary-check-signatures (pull request #173)
Validating notary: check for missing signatures
2016-06-23 16:16:04 +01:00
aaeb99ac25 Validating notary: check for missing signatures. The notary can only sign if all other signatures are present
Please enter the commit message for your changes. Lines starting
2016-06-23 16:15:14 +01:00
388c26dd35 Add obligation contract
Add a new Obligation contract, modelling an obligation to send an amount
of something (currently limited to cash) by some future point. Obligation
contracts introduce the concept of one contract being aware of other
contracts, and common interfaces for state objects so other contracts can
interpret them meaningfully.
2016-06-23 14:45:45 +01:00
f975c5181b Merged in rnicoll-obligation-experimental (pull request #183)
Minor: Preparation work for Obligation contract
2016-06-23 14:38:15 +01:00
99ae145edc Minor: Preparation work for Obligation contract 2016-06-23 13:17:22 +01:00
5f8454dad7 Merged in mike-experimental-module (pull request #182)
Add an experimental module.
2016-06-22 18:03:20 +02:00
809d1c5dcd Add an experimental module. 2016-06-22 18:00:36 +02:00
e5e5383e71 Minor formatting and typo fixes 2016-06-22 14:36:01 +01:00
2b072652f8 Merged in rnicoll-issued (pull request #176)
Further infrastructure for Obligation contract
2016-06-22 14:31:25 +01:00
d24ec06b40 Add netting support structures
Add NetType enum for use in contracts which deal with netting
Add BilateralNettingState interface
Add support for more complex issued things
2016-06-22 14:30:06 +01:00
7ee6bd05ce Refactor the wallet code:
- Rename NodeWalletService to InMemoryWalletService and move into the core module where it's available for unit testing.
- Make a new NodeWalletService that just inherits from InMemoryWalletService and doesn't customise it at all, for now.
- Take the cash specific functionality out of Wallet and into an extension property in the Cash contract (this compiles as CashKt.getCashBalance(wallet) for java users).
- Return the generated states in the fillWalletWithTestCash function.
2016-06-22 14:49:52 +02:00
f3d4639059 Testing: make the WalletFiller code a file-level singleton and fillTestWithCash an extension method. For Java users not much changes, the class is still called WalletFiller and the signature remains the same. Re-order some arguments to make it easier to use when accepting the defaults. 2016-06-22 14:49:52 +02:00
cdb3e2f126 Minor: move WalletFiller from node.testing to contracts.testing 2016-06-22 14:49:52 +02:00
650bf5d3de Merged in multiple-notary-support-docs (pull request #170)
Update docs relating to the multiple notary support work
2016-06-22 13:18:42 +01:00
9f1a4e9254 Update docs relating to the multiple notary support work 2016-06-22 13:18:00 +01:00
a16ae677ed Minor: fix some inspector warnings in IRSTests 2016-06-22 13:46:57 +02:00
37c89d7cf6 Minor: add a TODO that the trader protocol should be recording the transaction itself instead of letting the caller do it. 2016-06-22 13:46:57 +02:00
39186c7e99 Minor: correct an API doc in AttachmentStorage 2016-06-22 13:46:57 +02:00
749949669f Minor: Make a few class field names and constructor layouts more consistent. 2016-06-22 13:46:57 +02:00
d084f76594 Minor: Remove a no longer relevant kdoc line 2016-06-22 13:46:57 +02:00
5a3c9caffd Minor: Remove some unused parameters in a unit test utility method 2016-06-22 13:46:57 +02:00
5c6d604815 Merged in cor-133-ack-support (pull request #174)
Break out message handler changes
2016-06-22 09:53:10 +01:00
717a5ab197 Break out message handler changes
Special serializer for kotlin object definitions
2016-06-22 09:50:15 +01:00
859ee053d2 Merged in rg_todo_financetypes_242 (pull request #145)
Changed DateOffset to be an integer instead of enum. Usages and examples also changed. Also renamed to fixingPeriodOffset
2016-06-21 18:18:44 +01:00
6b80530ac6 Changed DateOffset to be an integer instead of enum. Usages and examples also changed. Also renamed to fixingPeriodOffset
Renamed fixingPeriod -> fixingPeriodOffset in the .json files
2016-06-21 18:17:39 +01:00
44a96c1974 Merged in cor-133-test-clock (pull request #175)
Support for moving TestClock to just beyond a specific instant (helpful for schedule related testing)
2016-06-21 16:58:15 +01:00
3ea1090446 Support for moving TestClock to just beyond a specific instant (helpful for schedule related testing)
Added TimeWindow to PR

Review feedback

Review feedback
2016-06-21 16:49:25 +01:00
3e82ee45f2 Merged in nodedircreate (pull request #139)
Todo resolution: Moved node directory creation into the abstract node.
2016-06-21 11:02:29 +01:00