rick.parker
5898a15579
Upgrade H2 to 1.4 to fix curious file corruption issue encountered by Patrick.
2016-10-28 17:39:10 +01:00
Clinton Alexander
572249be17
Merged in clint-traderdemocordapp (pull request #418 )
...
Removed trader demo from Corda and added some HTTP utilities.
2016-10-28 12:47:51 +00:00
Clinton Alexander
c3533bac7d
Improved error reporting.
2016-10-28 13:46:43 +01:00
Clinton Alexander
c42983fcfc
Removed now unused resource file.
2016-10-28 13:46:43 +01:00
Clinton Alexander
fdbd67db5c
Added some more error logging to Node.
2016-10-28 13:46:43 +01:00
Clinton Alexander
7eeea97653
Added new test utilities for HTTP requests.
2016-10-28 13:46:43 +01:00
Clinton Alexander
39cbab9ce1
Removed trader demo integration test. Fixed the AttachmentDemo which had unnecessary coupling to the traderdemo. Added new test util func.
2016-10-28 13:46:43 +01:00
Clinton Alexander
c3ac4efa70
Removed trader demo.
2016-10-28 13:46:43 +01:00
Roger Willis
e9461cbd4d
Merged in rog-quickfix (pull request #420 )
...
Fixed typo in 'client/build.gradle'
2016-10-28 12:40:37 +00:00
RogerWillis
b3dc24d8b3
Fixed typo in 'client/build.gradle'
2016-10-28 13:33:36 +01:00
Jose Coll
2ce310050e
Revert incorrect merge commit.
2016-10-28 10:28:15 +01:00
Jose Coll
b46de0b964
Merge remote-tracking branch 'origin/colljos-vault-transaction-notes' into colljos-vault-transaction-notes
...
# Conflicts:
# core/src/main/kotlin/com/r3corda/core/node/services/Services.kt
# core/src/main/kotlin/com/r3corda/core/testing/InMemoryVaultService.kt
# node/src/main/kotlin/com/r3corda/node/services/vault/NodeVaultService.kt
2016-10-28 09:59:58 +01:00
Jose Coll
369214a747
Additional method on VaultService to add notes to a transaction
...
Additional method on VaultService to retrieve notes for a transaction
2016-10-28 09:57:33 +01:00
Jose Coll
fd3dcc6327
Merge branch 'colljos-vault-code-clean-up-refactor' of https://bitbucket.org/R3-CEV/r3prototyping into colljos-vault-code-clean-up-refactor
2016-10-27 18:03:56 +01:00
Jose Coll
bd21326bc3
Re-factoring of CashBalances code (moved to VaultService)
...
Re-factoring of OnLedgerAsset generateSpend code (moved to VaultService)
Fixed broken tests caused by missing Transaction Context (when moving from InMemory to Db implementation of vault service in MockNetwork)
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)
Fixed items raised by MH in CRD-CR-58 code review.
Decommissioned InMemoryVaultService service (all dependent Tests updated to use NodeVaultService)
Merge remote-tracking branch 'remotes/origin/master' into colljos-vault-code-clean-up-refactor
Fixed conflict.
Fixed failing Commercial Paper test.
FungibleAsset reverted back to original filename.
2016-10-27 17:47:34 +01:00
Jose Coll
504ec42720
Additional method on VaultService to retrieve notes for a transaction
2016-10-27 16:35:26 +01:00
Jose Coll
bc525aabdf
FungibleAsset reverted back to original filename.
2016-10-27 16:21:05 +01:00
Jose Coll
f2e98ffba5
Merge branches 'colljos-vault-transaction-notes' and 'master' of https://bitbucket.org/R3-CEV/r3prototyping into colljos-vault-transaction-notes
2016-10-27 14:59:37 +01:00
Jose Coll
f94c9f8239
Fixed failing Commercial Paper test.
2016-10-27 12:58:13 +01:00
Jose Coll
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
Jose Coll
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
Ross Nicoll
63b1e356ad
Merged in rnicoll-unique-identifier-comparable (pull request #414 )
...
Correct Comparable interface used for isOrderedAndUnique()
2016-10-25 13:32:15 +00:00
Ross Nicoll
65a03efc55
Correct Comparable interface used for isOrderedAndUnique()
2016-10-25 14:31:37 +01:00
Clinton Alexander
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
Clinton Alexander
e5db17b029
Rewrote comment to improve readability.
2016-10-25 10:01:52 +01:00
Clinton Alexander
ecd63500aa
Merged in clint-irscoresplit (pull request #415 )
...
Removed IRS Core code.
2016-10-24 17:38:49 +00:00
Clinton Alexander
af902ee4df
Removed redundant whitespace.
2016-10-24 18:36:19 +01:00
Clinton Alexander
0877c60c00
Reverted main file.
2016-10-24 17:58:49 +01:00
Clinton Alexander
c18ed4b402
ProtocolLogicFactory now initiated before it is used.
2016-10-24 17:56:16 +01:00
Clinton Alexander
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
Clinton Alexander
546f3e2bbf
Removed dead plugin reference.
2016-10-24 17:56:16 +01:00
Clinton Alexander
2f5efb34d6
Removed the RatesFixProtocol and dependent code and moved to the IRS repo.
2016-10-24 17:56:16 +01:00
Clinton Alexander
2727d56b4a
Removed IRS specific code to new repo.
2016-10-24 17:56:16 +01:00
Clinton Alexander
a66d6b974e
Removed IRS contract.
2016-10-24 17:56:16 +01:00
Clinton Alexander
e3f5a96696
Fixed code that no longer compiled correctly.
2016-10-24 17:56:16 +01:00
Clinton Alexander
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
Clinton Alexander
b197a8fa66
Fixed comment on function definition.
2016-10-24 17:41:21 +01:00
Clinton Alexander
19a53ea12d
Added prerequisite for using the test clock.
2016-10-21 17:29:59 +01:00
Clinton Alexander
71e1c39622
Fixed type of useTestClock.
2016-10-21 16:42:00 +01:00
Clinton Alexander
8631a64c66
Moved capsule to node to remove it from src.
2016-10-21 14:17:05 +01:00
Clinton Alexander
8f326824f3
Test fix and review fix.
2016-10-21 12:09:21 +01:00
Clinton Alexander
6cd692776f
Compile error fix.
2016-10-21 11:32:29 +01:00
Clinton Alexander
cbb8aa74f9
Replaced clock object with clock class and added documentation.
2016-10-21 11:32:29 +01:00
Clinton Alexander
54e002f654
Clock now instantiates via reflection to allow demo clocks to be passed in.
2016-10-21 11:32:29 +01:00
Clinton Alexander
622b5cabf7
Fixed merge conflict.
2016-10-21 11:32:29 +01:00
Clinton Alexander
1d6b8de11e
Added clock to the node
2016-10-21 11:32:29 +01:00
Clinton Alexander
aad75c5152
Fixed code that no longer compiled correctly.
2016-10-21 11:32:29 +01:00
Clinton Alexander
201561497a
Added clock to node configuration to allow for creating a demo with a different clock.
2016-10-21 11:31:18 +01:00
Clinton Alexander
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
Shams Asari
e2d6ace449
RPC client authentication using user/password from config file
2016-10-20 17:55:16 +01:00
