ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2024-12-28 08:48:57 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity
980 Commits 91 Branches 405 Tags 354 MiB
779034691e
Commit Graph

980 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Clinton Alexander
b050411810 Fixed compile error in IRSDemo and updated demo data to match new format. 2016-06-28 14:03:32 +01:00
Clinton Alexander
5de855e045 Fixed a merge error and parameterised host for upload rates. 2016-06-28 14:03:32 +01:00
Clinton Alexander
9fc89fc4a2 Connections now timeout correctly if something goes wrong with the server. 2016-06-28 14:03:32 +01:00
Clinton Alexander
90a24588bc Added TODOs and replaced default path with an exception. 2016-06-28 14:03:32 +01:00
Clinton Alexander
507d9ea4ae Added new integration test for the IRSDemo and refactored the demo to 
run in integration tests.
 2016-06-28 14:03:32 +01:00
Clinton Alexander
9639768069 Corrected the currency mismatch in the example trade. 2016-06-28 14:03:32 +01:00
Clinton Alexander
0788e8d64c IRS demo to now has roles for NodeA/NodeB and most options are now~ optional. NodeA can be run without the shell script. 2016-06-28 14:03:32 +01:00
Ross Nicoll
23c3112660 Merged in rnicoll-obligation-main (pull request #185) 
Move Obligation contract into contracts module
 2016-06-27 17:57:31 +01:00
Ross Nicoll
228513671d Move Obligation contract into contracts module 2016-06-27 17:54:04 +01:00
Ross Nicoll
9994d129f2 General cleanup based on first round of feedback 
* Rename AggregateCommands to IssuanceCommands
 * Reorder comparisons to be consistent
 * Rename verifyDefaultCommand to verifySetLifecycleCommand
 * Rename currency to issued/product
 * Add note about needing to rethink timestamping
 * Rename issuer to obligor, and owner to beneficiary
 * Move lifecycle inversion code into SetLifecycle command
 * Correct comments regarding cash states
 * Rework description of contractHash parameter
 * Fixes 'netting equal balances due between parties', and add further netting tests
 * Separate calculations involving issued products and the underlying product
 * Use signed transactions in obligation tests
 * Add verification tests for changing lifecycle
 2016-06-27 17:49:52 +01:00
Mike Hearn
7aa14dc75f Merged in mike-suppress-experimental-warnings (pull request #188) 
Suppress compiler warnings in experimental. They are still expected to be fixed in the other modules.
 2016-06-27 18:02:08 +02:00
Mike Hearn
24c237096b Merged in mike-codestyle-compiler-warnings (pull request #189) 
Add a policy about compiler warnings.
 2016-06-27 18:01:50 +02:00
Mike Hearn
cb90a8c09b Add a policy about compiler warnings. 2016-06-27 15:41:18 +02:00
Mike Hearn
848b998d26 Suppress compiler warnings in experimental. They are still expected to be fixed in the other modules. 2016-06-27 15:35:27 +02:00
Mike Hearn
560a735fa3 Merged in mike-fix-walletfiller (pull request #187) 
Testing: Fix the wallet filler code.
 2016-06-27 15:01:28 +02:00
Andras Slemmer
10b17d6862 Merged in java-test-dsl (pull request #181) 
Java test DSL
 2016-06-24 18:53:02 +01:00
Andras Slemmer
47decb3bbe coree: Expose MOCK_IDENTITY_SERVICE as MockIndentityService instead of IdentityService 2016-06-24 18:33:53 +01:00
Andras Slemmer
5973725186 core: Make top-level side-effecting getters lazy instead 2016-06-24 18:33:21 +01:00
Andras Slemmer
10d8f5cd06 core: Add comment on how to define globals for the Java test DSL 2016-06-24 16:37:43 +01:00
Andras Slemmer
bc326660a3 contracts, core: Fix static init cycle issue of JavaTestHelpers 2016-06-24 16:37:43 +01:00
Andras Slemmer
341adafd3a contracts, core: Rename Java to JavaTestHelpers 2016-06-24 16:37:43 +01:00
Andras Slemmer
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
Andras Slemmer
28e85923a3 core: Add CashTestsJava.java, containing some of CashTests.kt in Java 2016-06-24 16:37:43 +01:00
Andras Slemmer
bec1ab7a7e core: Add javadoc on how to be Java-compatible with the Kotlin DSL 2016-06-24 16:37:43 +01:00
Andras Slemmer
6109065dee core: Use LastLineShouldTestForAcceptOrFailure trick on rejects() 2016-06-24 16:37:43 +01:00
Mike Hearn
2dfcff1f31 Testing: Fix the wallet filler code. 2016-06-24 17:13:27 +02:00
Mike Hearn
1b72feff7a Testing: Fix the wallet filler code. 2016-06-24 14:57:24 +02:00
Andras Slemmer
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
Andras Slemmer
2d8d5571c2 core: Add more info to ClashingThreads exception 2016-06-23 18:06:57 +01:00
Andras Slemmer
ac69f566c9 node: Add another test testing correct LinearState sequencing 2016-06-23 18:06:57 +01:00
Andras Slemmer
57270c8c66 core: Add nonce to DummyLinearState 2016-06-23 18:06:57 +01:00
Andras Slemmer
6bab0eb79f core: Add comment about Wallet.states 2016-06-23 18:06:57 +01:00
Andras Slemmer
3a84e2fe9d node: Add test for LinearState thread clash 2016-06-23 18:06:57 +01:00
Andras Slemmer
f233780e08 core: Add DummyLinearState and AlwaysSucceedContract for testing 2016-06-23 18:06:57 +01:00
Andras Slemmer
2c7b86fee2 core: Add LinearState thread clash check to InMemoryWalletService.notifyAll 2016-06-23 18:06:57 +01:00
Andras Slemmer
3cc0cef9c5 core: Typo 2016-06-23 18:06:57 +01:00
Andrius Dagys
497fcabd4d Merged in notary-check-signatures (pull request #173) 
Validating notary: check for missing signatures
 2016-06-23 16:16:04 +01:00
Andrius Dagys
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
Ross Nicoll
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
Ross Nicoll
f975c5181b Merged in rnicoll-obligation-experimental (pull request #183) 
Minor: Preparation work for Obligation contract
 2016-06-23 14:38:15 +01:00
Ross Nicoll
99ae145edc Minor: Preparation work for Obligation contract 2016-06-23 13:17:22 +01:00
Mike Hearn
5f8454dad7 Merged in mike-experimental-module (pull request #182) 
Add an experimental module.
 2016-06-22 18:03:20 +02:00
Mike Hearn
809d1c5dcd Add an experimental module. 2016-06-22 18:00:36 +02:00
Andrius Dagys
e5e5383e71 Minor formatting and typo fixes 2016-06-22 14:36:01 +01:00
Ross Nicoll
2b072652f8 Merged in rnicoll-issued (pull request #176) 
Further infrastructure for Obligation contract
 2016-06-22 14:31:25 +01:00
Ross Nicoll
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
Mike Hearn
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
Mike Hearn
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
Mike Hearn
cdb3e2f126 Minor: move WalletFiller from node.testing to contracts.testing 2016-06-22 14:49:52 +02:00
Andrius Dagys
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