1055 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
Andrius Dagys	9f1a4e9254	Update docs relating to the multiple notary support work	2016-06-22 13:18:00 +01:00
Mike Hearn	a16ae677ed	Minor: fix some inspector warnings in IRSTests	2016-06-22 13:46:57 +02:00
Mike Hearn	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
Mike Hearn	39186c7e99	Minor: correct an API doc in AttachmentStorage	2016-06-22 13:46:57 +02:00
Mike Hearn	749949669f	Minor: Make a few class field names and constructor layouts more consistent.	2016-06-22 13:46:57 +02:00
Mike Hearn	d084f76594	Minor: Remove a no longer relevant kdoc line	2016-06-22 13:46:57 +02:00
Mike Hearn	5a3c9caffd	Minor: Remove some unused parameters in a unit test utility method	2016-06-22 13:46:57 +02:00
Rick Parker	5c6d604815	Merged in cor-133-ack-support (pull request #174) ... Break out message handler changes	2016-06-22 09:53:10 +01:00
rick.parker	717a5ab197	Break out message handler changes ... Special serializer for kotlin object definitions	2016-06-22 09:50:15 +01:00
Richard Green	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
Richard Green	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
Rick Parker	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
rick.parker	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
Clinton Alexander	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
Andras Slemmer	dad1fdb759	Merged in R3-CEV/internal/add-back-immn-buffering-open (pull request #171) ... Revert "node: remove buffering logic from InMemoryMessagingNetwork"	2016-06-20 18:16:29 +01:00
Andras Slemmer	e29a9b15c3	Revert "node: remove buffering logic from InMemoryMessagingNetwork" ... This reverts commit bc7ea5f0c5a61e9c3f9d7825e2944e4d27141320.	2016-06-20 17:50:19 +01:00
Ross Nicoll	39d60bc74b	Merged in rnicoll-obligation-infrastructure (pull request #167) ... Add obligation infrastructure	2016-06-20 16:09:02 +01:00
Ross Nicoll	93e9d0459c	Add custom serialiser for NonEmptySet	2016-06-20 16:08:17 +01:00
Ross Nicoll	723e610dfc	Rename verifyMoveCommand() ... Rename verifyMoveCommands() to verifyMoveCommand() to represent that move commands must be singular within a transaction.	2016-06-20 16:08:16 +01:00
Ross Nicoll	af53a52b06	Add common Issue and Move commands ... * Add common Issue command to encourage presence of a nonce value when issuing state objects. * Add common Move command for contracts which support being moved in order to fulfil other contracts.	2016-06-20 16:08:16 +01:00
Andras Slemmer	32b593671b	Merged in remove-warnings (pull request #169) ... Remove warnings	2016-06-20 14:45:04 +01:00
Shams Asari	411fd1aeb3	Upgraded to artemis 1.3.0 so that exceptions are thrown if something goes wrong on startup	2016-06-20 14:29:27 +01:00
Ross Nicoll	8f57213270	Merged in rnicoll-force-record-tx (pull request #152) ... Require all transactions are added via the ServiceHub.recordTransaction() function	2016-06-20 14:25:20 +01:00
Ross Nicoll	a5e07c2600	Require all transactions are added via the ServiceHub.recordTransaction() function	2016-06-20 14:24:55 +01:00
Andras Slemmer	b99ddfdb7d	demo: Suppress unused var warning	2016-06-20 14:16:13 +01:00