Commit Graph

9665 Commits

Author SHA1 Message Date
c8be3f9276 Merged in irsdemocleanup (pull request #209)
Added OkHttp library and improved help text to demos.
2016-07-08 16:40:30 +01:00
0d17e8d98f Merged in rnicoll-clause (pull request #210)
Add support for clause based contract verification
2016-07-08 11:17:46 +01:00
1ae8ada999 Add support for clause based contract verification 2016-07-08 11:17:24 +01:00
639df4dcb9 Http Client is now lazy init. 2016-07-08 10:48:55 +01:00
fb2efd8fc1 Merged in mnesbit-cor-249-serviceloader-for-web-apis (pull request #204)
Make the IRS Demo web api an api plugin (scanned from the Node classpath) and use the same permission checking entry point for web api's as the scheduler.
2016-07-08 10:47:02 +01:00
2f9606998a Merge branch 'mnesbit-cor-249-serviceloader-for-web-apis' of https://bitbucket.org/R3-CEV/r3prototyping into mnesbit-cor-249-serviceloader-for-web-apis 2016-07-08 10:38:38 +01:00
eee049d66b Add cacheing to ServiceLoader scanning of plugins and add a TODO on whitelisting 2016-07-08 10:38:23 +01:00
8d31df5fe1 Remove @Suppress now we use standard Kotlin Int 2016-07-08 10:38:22 +01:00
1557a82992 Make ServiceLoader results for CordaPlugins a protected property on the AbstractNode 2016-07-08 10:38:21 +01:00
51ba0cc8dd Make the IRS Demo web api an api plugin (scanned from the Node classpath) and use the same permission checking entry point for web api's as the scheduler. 2016-07-08 10:38:18 +01:00
d9d4fb360f Make the IRS Demo web api an api plugin (scanned from the Node classpath) and use the same permission checking entry point for web api's as the scheduler. 2016-07-08 10:34:32 +01:00
f0f2dc4eb5 Add missing import 2016-07-08 10:34:31 +01:00
1fb4371de9 Make the IRS Demo web api an api plugin (scanned from the Node classpath) and use the same permission checking entry point for web api's as the scheduler.
Fix whitespace

Change ProtocolLogicRefFactory to use Map<String, Set<String>> as whitelist definition
2016-07-08 10:34:30 +01:00
c260c227a9 Add cacheing to ServiceLoader scanning of plugins and add a TODO on whitelisting 2016-07-08 10:24:51 +01:00
a1177f05c1 Merged in mike-add-gradle-versions (pull request #207)
Add a version number to gradle and allow "gradle install" to install the core module to the local Maven repository.
2016-07-08 10:04:01 +01:00
01e64d3030 Fixed merge conflicts. 2016-07-07 17:23:14 +01:00
d4da633b1e Fixed merge issues 2016-07-07 16:31:52 +01:00
24deb5a79c Added more useful help message that includes basic usage to the TraderDemo. 2016-07-07 16:28:27 +01:00
98b02e9d33 Added some simple documentation to the IRSDemo. 2016-07-07 16:25:01 +01:00
3651bd54aa Increased read timeout in order to avoid timeouts on long fixing periods (ie; 2020-01-01) on the IRS demo. 2016-07-07 16:22:09 +01:00
6381b5e6a1 Added OkHttp and used it to clean up the HTTP calls in the demo and then moved those new functions to a util lib. 2016-07-07 16:22:09 +01:00
fb93b86d6b Move test class into correct package 2016-07-07 15:51:47 +01:00
db131eb2c0 Remove @Suppress now we use standard Kotlin Int 2016-07-07 14:03:08 +01:00
ad3e9be1c8 Add a version number to gradle and allow "gradle install" to install the core module to the local Maven repository. 2016-07-07 13:59:55 +01:00
0157018901 Make ServiceLoader results for CordaPlugins a protected property on the AbstractNode 2016-07-07 13:55:15 +01:00
b498928f75 Remove the "verify correct notary has signed" check. This is no longed necessary as the required notary key is added to the "signers" list during transaction construction. We have general validation rules that check the correct notary was included in the signers list, and that we have signatures for all "signers". 2016-07-07 13:22:30 +01:00
6c55034178 Merge branch 'mnesbit-cor-249-serviceloader-for-web-apis' of https://bitbucket.org/R3-CEV/r3prototyping into mnesbit-cor-249-serviceloader-for-web-apis
# Conflicts:
#	core/src/main/kotlin/com/r3corda/core/node/CordaPluginRegistry.kt
#	core/src/main/kotlin/com/r3corda/core/node/ServiceHub.kt
#	node/src/main/kotlin/com/r3corda/node/internal/AbstractNode.kt
#	node/src/main/kotlin/com/r3corda/node/services/api/ServiceHubInternal.kt
#	src/main/kotlin/com/r3corda/demos/IRSDemo.kt
#	src/main/kotlin/com/r3corda/demos/api/InterestRateSwapAPI.kt
#	src/main/kotlin/com/r3corda/demos/protocols/ExitServerProtocol.kt
2016-07-07 12:20:51 +01:00
92aeb74c19 Make the IRS Demo web api an api plugin (scanned from the Node classpath) and use the same permission checking entry point for web api's as the scheduler. 2016-07-07 12:17:06 +01:00
8dc6f760bb Add missing import 2016-07-07 12:08:53 +01:00
bdb34ab26a Make the IRS Demo web api an api plugin (scanned from the Node classpath) and use the same permission checking entry point for web api's as the scheduler.
Fix whitespace

Change ProtocolLogicRefFactory to use Map<String, Set<String>> as whitelist definition
2016-07-07 12:03:24 +01:00
bbc5c2e981 Merged in mike-july-dependency-upgrades (pull request #200)
Upgrade dependencies, July edition.
2016-07-06 16:25:52 +01:00
ffa32f21cd Merged in mike-small-fixes (pull request #205)
Small fixes
2016-07-06 16:25:27 +01:00
2e3f689fd3 Minor: fix PublicKey.toShortString after the switch to ed25519 2016-07-06 16:04:10 +01:00
9e849378cf Minor: add some assertions in the WalletFiller code after a test was observed to fail due to a negative amount. 2016-07-06 14:02:40 +01:00
f6e7ffdd31 Fix a race condition in the MockNode class that only shows up when used in thread-per-node mode. Witnessed in the unit tests. 2016-07-06 14:02:40 +01:00
6fb7e59b91 Upgrade dependencies, July edition. 2016-07-06 13:56:22 +01:00
c38f99419f Merged in unified-test-dsl (pull request #203)
Unified test dsl
2016-07-06 13:30:59 +01:00
0cf54d1c1f test dsl: Comment full stops 2016-07-06 13:25:08 +01:00
26d8973746 test dsl: Add TODO on type synonyms 2016-07-06 13:25:08 +01:00
f177b1ffaa test dsl: LastLineShouldTestForVerifiesOrFails->EnforceVerifyOrFail 2016-07-06 13:25:08 +01:00
e31b769fef test dsl: Dsl->DSL, add top-level transaction primitive, add ledger-embedded signAll, other cosmetics 2016-07-06 13:25:08 +01:00
e3d6f51049 contracts, core, node: Port TransactionForTest tests to new DSL 2016-07-06 13:25:08 +01:00
a27f195b4f core: Add LastLineShouldBeVerifiesOrFails, fix attachment primitive, Java interop 2016-07-06 13:25:08 +01:00
bdda3d239a contracts: Port Java CashTests to new DSL 2016-07-06 13:25:08 +01:00
7634331f68 contracts: Port CashTests to new dsl 2016-07-06 13:25:08 +01:00
f4a6a43aa6 contracts, core: Port CommercialPaperTests, IRSTests, ObligationTests, TransactioGroupTests 2016-07-06 13:25:08 +01:00
cb47e00feb core: Add convenience input(), remove TransactionGroupDSL 2016-07-06 13:25:08 +01:00
cde315aca9 contracts, node: Port CommercialPaperTests, TwoPartyTradeProtocolTests and GroupToGraphConversion to use new dsl 2016-07-06 13:25:08 +01:00
9b36df607e core: Remove binding of State type in test dsl 2016-07-06 13:25:08 +01:00
4a89be8785 build: Run integtests after regular ones 2016-07-06 13:25:08 +01:00