Commit Graph

5358 Commits

Author SHA1 Message Date
f314bab6c8 Replacing the two params of AbstractNodeService with single ServiceHubInternal 2016-09-13 11:52:31 +01:00
53de66a23d Merged in cor-344-persistence-jdbc-transactions (pull request #353)
Add database transactions ready for more widespread persistence.
2016-09-13 10:48:48 +01:00
27cb1c3597 Introduce database transactions around message handling, web API and in protocols. 2016-09-13 10:47:50 +01:00
422a766c1a Minor persistent uniqueness provider tweak 2016-09-13 10:37:53 +01:00
789bb2bb9d Universal: removed some debug code 2016-09-12 16:51:39 +01:00
143c6d2d90 Universal: started IRS contract/test, added min/max 2016-09-12 16:41:19 +01:00
ee637b79e2 Merge branch 'mike-fix-wms-for-k104' 2016-09-12 16:40:11 +01:00
f3b6352589 Merge branch 'mike-rename-amc' 2016-09-12 16:40:03 +01:00
2f0a78c924 Merged in gradle-based-all-tests (pull request #347)
Remove non-gradle "All tests" as seems to hang and add several Gradle based run configurations.
2016-09-12 15:18:54 +01:00
0b1c3a09a9 Remove non-gradle "All tests" as seems to hang and add several Gradle based run configurations.
Added buildCordaJAR to install step.
2016-09-12 15:17:54 +01:00
836933d223 experimental: Fix compile errors 2016-09-12 14:34:11 +01:00
9f6415efab Universal: Post refactor, rollout unit test passing 2016-09-12 13:49:50 +01:00
b93aa71afa Universal: checkpoint before refactor 2016-09-12 13:49:50 +01:00
0e37547af0 Rename ArtemisMessagingClient to NodeMessagingClient to make the purpose clearer once we start landing the clientrpc framework. 2016-09-12 13:16:45 +01:00
f6def0ef8f Minor: fix build for Kotlin 1.0.4 pre-release. It is stricter about some dubious code. 2016-09-12 12:18:35 +01:00
dab883dcba Merged in andrius-persistent-notary (pull request #349)
Single node persistent notary
2016-09-12 10:30:47 +01:00
0ed6a0ef4d Added a persistent uniqueness provider, backed by a JDBCHashMap.
Enabled a single node persistent notary.
2016-09-12 10:15:03 +01:00
8cad9efd27 Merged in clockutils-fix (pull request #348)
Remove use of interrupts in ClockUtils
2016-09-09 16:46:35 +01:00
03a04d10ca Remove use of interrupts to in ClockUtils 2016-09-09 16:45:49 +01:00
a11de4258a Merged in cor-344-persistent-map (pull request #338)
JDBC/Exposure table backed persistent map
2016-09-09 14:02:31 +01:00
879802f7fd JDBC backed persistent hash map implementation. 2016-09-09 14:01:05 +01:00
028fc72491 Merged in mnesbit-cleanup-remove-irs-from-node (pull request #346)
Move Interest Rate related classes out of :node
2016-09-09 12:16:23 +01:00
bf0721868e Move Interest Rate related classes out of :node to reduce dependency of :node module on any specific contract. (Currently only WalletMonitorService and CashBalanceAsMetricsObserver stop me removing the compil dependency of :node on :contracts rather than :core). This has required that I modify fixing protocol to require information on what class of Oracle to use. 2016-09-09 11:31:08 +01:00
600c630f91 Merged in aslemmer-relax-tptp-tests (pull request #344)
Relax tptp tests
2016-09-09 11:24:19 +01:00
02a1b93708 test-utils: Address PR comments on Expect, fix variance, add some comments 2016-09-09 10:54:16 +01:00
d19e8b6a7b test-utils: Remove unnecessary type variable from Expect functions, fixes compile error 2016-09-09 10:54:16 +01:00
0fc560d20a node: Relax TwoPartyTradeProtocolTests so it only checks a subsequence of store accesses 2016-09-09 10:54:16 +01:00
ca93f33356 test-utils: Extend Expect DSL to work with Iterables 2016-09-09 10:54:16 +01:00
31f3bb28bb Fix build 2016-09-09 11:47:40 +02:00
34890b7678 Merged in james-encumbrances (pull request #289)
Encumbrances implemented by reference to an index of an output state
2016-09-09 11:32:03 +02:00
53967e26ae Minor type fix in the encumbrances doc section 2016-09-09 09:31:52 +00:00
5f048889f0 Merged in mike-tweak-erroror (pull request #343)
Minor: move ErrorOr into the core module and tweak its API a bit. Add a Path div operator.
2016-09-09 11:29:22 +02:00
b7e6c210d9 Merge with master
# Conflicts:
#	docs/build/html/_sources/index.txt
#	docs/build/html/_sources/protocol-state-machines.txt
#	docs/build/html/_sources/tutorial-contract-clauses.txt
#	docs/build/html/index.html
#	docs/build/html/protocol-state-machines.html
#	docs/build/html/searchindex.js
#	docs/build/html/tutorial-contract-clauses.html
#	docs/build/html/tutorial-contract.html
2016-09-09 09:43:14 +01:00
455a0ac9c9 Tidied document code example 2016-09-08 23:02:01 +01:00
e187c4d91d Further tweaks based on feedback - simplified the embedded timelock contract 2016-09-08 22:49:24 +01:00
71f0325a39 Merged in mnesbit-cleanup-integration-tests-not-in-default-build (pull request #345)
Ensure integration tests not directly called from build or installDist.
2016-09-08 16:41:42 +01:00
9518c38f29 Ensure integration tests in modules are in separate configurations and not directly called from build or installDist. 2016-09-08 15:28:04 +01:00
4fb0148f96 Merged in mnesbit-cleanup-driver-use-standalone-node (pull request #340)
Use standalone Corda main class and configuration in the Driver, rather than a separate class.
2016-09-08 14:59:18 +01:00
af72978ace Remove redundant import. 2016-09-08 14:41:17 +02:00
245d6ce21f Use standalone Corda main class and configuration in the Driver, rather than a separate class.
Better check for Notary services
2016-09-08 12:44:12 +01:00
abe9cfbd67 Merged in aslemmer-node-client-models (pull request #307)
Aslemmer node client models
2016-09-08 12:31:35 +01:00
34ee44b532 Minor: move ErrorOr into the core module and tweak its API a bit. Add a Path div operator. 2016-09-08 13:12:15 +02:00
d8d639f192 Merged in mike-small-tweaks (pull request #337)
A few small tweaks
2016-09-08 12:40:14 +02:00
0412a70301 client: Rename TransactionCreateState -> GatheredTransactionData, fix compile error after rebase 2016-09-08 11:25:26 +01:00
e235375a89 client: Add stubs/todo for handling state snapshots 2016-09-08 11:25:26 +01:00
3acbda53e4 client: AmountBindings class->object 2016-09-08 11:25:26 +01:00
2869889769 client: Add lengthier explanation of Models 2016-09-08 11:25:26 +01:00
6b6c51b8d4 client: Elaborate on why we need two IDs in TransactionCreateStateModel 2016-09-08 11:25:26 +01:00
d5c4202162 client: Fix when (this) to use virtual dispatch instead 2016-09-08 11:25:26 +01:00
3a5247f016 client: Small tweaks 2016-09-08 11:25:26 +01:00