f94c9f8239
Fixed failing Commercial Paper test.
2016-10-27 12:58:13 +01:00
74e89181da
Merge remote-tracking branch 'remotes/origin/master' into colljos-vault-code-clean-up-refactor
...
# Conflicts:
# core/src/main/kotlin/com/r3corda/core/contracts/Structures.kt
# node/src/test/kotlin/com/r3corda/node/services/NodeSchedulerServiceTest.kt
Fixed conflict.
2016-10-27 12:57:37 +01:00
7d080c39df
Merge remote-tracking branch 'remotes/origin/master' into colljos-vault-code-clean-up-refactor
...
# Conflicts:
# core/src/main/kotlin/com/r3corda/core/contracts/Structures.kt
# node/src/test/kotlin/com/r3corda/node/services/NodeSchedulerServiceTest.kt
Fixed failing CommercialPaper test
(caused by re-use of same database transaction context for vault across two different transaction participants)
2016-10-27 12:56:08 +01:00
63b1e356ad
Merged in rnicoll-unique-identifier-comparable (pull request #414 )
...
Correct Comparable interface used for isOrderedAndUnique()
2016-10-25 13:32:15 +00:00
65a03efc55
Correct Comparable interface used for isOrderedAndUnique()
2016-10-25 14:31:37 +01:00
8f1329b03f
Merged in clint-capletnode (pull request #413 )
...
Moved the Corda Caplet to Node to clear out root src dir.
2016-10-25 09:37:32 +00:00
e5db17b029
Rewrote comment to improve readability.
2016-10-25 10:01:52 +01:00
ecd63500aa
Merged in clint-irscoresplit (pull request #415 )
...
Removed IRS Core code.
2016-10-24 17:38:49 +00:00
af902ee4df
Removed redundant whitespace.
2016-10-24 18:36:19 +01:00
0877c60c00
Reverted main file.
2016-10-24 17:58:49 +01:00
c18ed4b402
ProtocolLogicFactory now initiated before it is used.
2016-10-24 17:56:16 +01:00
f92f7d8d56
NodeSchedulerService no longer takes a default protocol logic ref factory (because otherwise no protocols are whitelisted) and instead now uses the one constructed in the node.
2016-10-24 17:56:16 +01:00
546f3e2bbf
Removed dead plugin reference.
2016-10-24 17:56:16 +01:00
2f5efb34d6
Removed the RatesFixProtocol and dependent code and moved to the IRS repo.
2016-10-24 17:56:16 +01:00
2727d56b4a
Removed IRS specific code to new repo.
2016-10-24 17:56:16 +01:00
a66d6b974e
Removed IRS contract.
2016-10-24 17:56:16 +01:00
e3f5a96696
Fixed code that no longer compiled correctly.
2016-10-24 17:56:16 +01:00
3ec6490d0a
Merged in clint-irsintegrationfix (pull request #412 )
...
Fixes the IRS integration tests in the IRS repo.
2016-10-24 16:53:46 +00:00
b197a8fa66
Fixed comment on function definition.
2016-10-24 17:41:21 +01:00
19a53ea12d
Added prerequisite for using the test clock.
2016-10-21 17:29:59 +01:00
71e1c39622
Fixed type of useTestClock.
2016-10-21 16:42:00 +01:00
8631a64c66
Moved capsule to node to remove it from src.
2016-10-21 14:17:05 +01:00
8f326824f3
Test fix and review fix.
2016-10-21 12:09:21 +01:00
6cd692776f
Compile error fix.
2016-10-21 11:32:29 +01:00
cbb8aa74f9
Replaced clock object with clock class and added documentation.
2016-10-21 11:32:29 +01:00
54e002f654
Clock now instantiates via reflection to allow demo clocks to be passed in.
2016-10-21 11:32:29 +01:00
622b5cabf7
Fixed merge conflict.
2016-10-21 11:32:29 +01:00
1d6b8de11e
Added clock to the node
2016-10-21 11:32:29 +01:00
aad75c5152
Fixed code that no longer compiled correctly.
2016-10-21 11:32:29 +01:00
201561497a
Added clock to node configuration to allow for creating a demo with a different clock.
2016-10-21 11:31:18 +01:00
0ee4f9c19b
Added DriverNodeInfo to allow access to the host and port for the api address for use in integration tests.
2016-10-21 11:31:18 +01:00
e2d6ace449
RPC client authentication using user/password from config file
2016-10-20 17:55:16 +01:00
75f671a446
Decommissioned InMemoryVaultService service (all dependent Tests updated to use NodeVaultService)
2016-10-20 13:10:00 +01:00
c7d98b8c6b
Fixed items raised by MH in CRD-CR-58 code review.
2016-10-20 10:52:51 +01:00
60c1dcdbde
Merged in mnesbit-cor-389-all-transaction-tests-in-db (pull request #411 )
...
Messages requiring redelivery to late registered handler persisted in database.
2016-10-20 08:36:37 +00:00
30b7eec18c
Remove the file based checkpoints and transactions from the tests.
...
Messages requiring redelivery to late registered handler persisted in database.
Remove spurious comment and make local val not var
2016-10-19 16:33:12 +01:00
8eee4afe7d
Merged in mnesbit-cor-389-driver-remove-startClient (pull request #409 )
...
Unify messaging services to have a database and not support client type connections.
2016-10-19 14:09:50 +00:00
04920c9507
Additional method on VaultService to add notes to a transaction
2016-10-19 15:06:52 +01:00
ef2ff777a7
Adapted all Contract tests that perform Cash Spending to use the Vault Service.
...
Note: pending resolution of 2 failing tests (IRSSimulation, CP issue, move & redeem)
2016-10-19 10:38:14 +01:00
6c6d7f8546
Merged in bugfix-for-persistent-scheduler (pull request #410 )
...
Fixed intermittent stack serialization issue with persistent scheduler.
2016-10-18 17:23:04 +00:00
4db1836996
Unify messaging services to have a database and not support client type connections when they should use the RPC connections. Also, push NodeInfo across to the driver via the web interface to remove that use of startClient.
...
Fix typo
2016-10-18 17:48:52 +01:00
8a3027ffd6
Fixed intermittent stack serialization issue with persistent scheduler.
...
Improved exception reporting when fiber serialization fails or other internal Quasar error to help with future Kryo errors when checkpointing.
2016-10-18 17:05:10 +01:00
aac64ecb37
Merged in clint-irscordapp (pull request #406 )
...
Moved the IRS Demo out of R3 Prototyping into IRS repo.
2016-10-18 15:42:05 +00:00
c23aea3997
Fixed broken tests caused by missing Transaction Context (when moving from InMemory to Db implementation of vault service in MockNetwork)
2016-10-18 10:27:12 +01:00
62dfea2a1a
Re-factoring of OnLedgerAsset generateSpend code (moved to VaultService)
2016-10-17 17:58:26 +01:00
3403d50168
Merged pat-cash-creation-ui into master
2016-10-17 16:10:53 +01:00
6a20f32a7a
Merged in persistent-scheduler (pull request #405 )
...
Persistent scheduler
2016-10-17 12:35:40 +00:00
6a25fcfe8c
Persistent scheduler, with race condition removed.
2016-10-17 13:33:32 +01:00
6e2396ed32
Merged in persistent-transaction-mapping (pull request #407 )
...
Make transaction -> statemachine id mapping persistent.
2016-10-17 11:02:33 +00:00
962fdba0f8
Make transaction -> statemachine id mapping persistent.
2016-10-17 11:33:29 +01:00
