Mike Hearn
|
f3b6352589
|
Merge branch 'mike-rename-amc'
|
2016-09-12 16:40:03 +01:00 |
|
Rick Parker
|
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 |
|
rick.parker
|
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 |
|
Andras Slemmer
|
836933d223
|
experimental: Fix compile errors
|
2016-09-12 14:34:11 +01:00 |
|
sofusmortensen
|
9f6415efab
|
Universal: Post refactor, rollout unit test passing
|
2016-09-12 13:49:50 +01:00 |
|
sofusmortensen
|
b93aa71afa
|
Universal: checkpoint before refactor
|
2016-09-12 13:49:50 +01:00 |
|
Mike Hearn
|
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 |
|
Andrius Dagys
|
dab883dcba
|
Merged in andrius-persistent-notary (pull request #349)
Single node persistent notary
|
2016-09-12 10:30:47 +01:00 |
|
Andrius Dagys
|
0ed6a0ef4d
|
Added a persistent uniqueness provider, backed by a JDBCHashMap.
Enabled a single node persistent notary.
|
2016-09-12 10:15:03 +01:00 |
|
Rick Parker
|
8cad9efd27
|
Merged in clockutils-fix (pull request #348)
Remove use of interrupts in ClockUtils
|
2016-09-09 16:46:35 +01:00 |
|
rick.parker
|
03a04d10ca
|
Remove use of interrupts to in ClockUtils
|
2016-09-09 16:45:49 +01:00 |
|
Rick Parker
|
a11de4258a
|
Merged in cor-344-persistent-map (pull request #338)
JDBC/Exposure table backed persistent map
|
2016-09-09 14:02:31 +01:00 |
|
rick.parker
|
879802f7fd
|
JDBC backed persistent hash map implementation.
|
2016-09-09 14:01:05 +01:00 |
|
Matthew Nesbit
|
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 |
|
Matthew Nesbit
|
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 |
|
Andras Slemmer
|
600c630f91
|
Merged in aslemmer-relax-tptp-tests (pull request #344)
Relax tptp tests
|
2016-09-09 11:24:19 +01:00 |
|
Andras Slemmer
|
02a1b93708
|
test-utils: Address PR comments on Expect, fix variance, add some comments
|
2016-09-09 10:54:16 +01:00 |
|
Andras Slemmer
|
d19e8b6a7b
|
test-utils: Remove unnecessary type variable from Expect functions, fixes compile error
|
2016-09-09 10:54:16 +01:00 |
|
Andras Slemmer
|
0fc560d20a
|
node: Relax TwoPartyTradeProtocolTests so it only checks a subsequence of store accesses
|
2016-09-09 10:54:16 +01:00 |
|
Andras Slemmer
|
ca93f33356
|
test-utils: Extend Expect DSL to work with Iterables
|
2016-09-09 10:54:16 +01:00 |
|
Mike Hearn
|
31f3bb28bb
|
Fix build
|
2016-09-09 11:47:40 +02:00 |
|
Mike Hearn
|
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 |
|
Mike Hearn
|
53967e26ae
|
Minor type fix in the encumbrances doc section
|
2016-09-09 09:31:52 +00:00 |
|
Mike Hearn
|
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 |
|
jamescarlyle
|
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 |
|
jamescarlyle
|
455a0ac9c9
|
Tidied document code example
|
2016-09-08 23:02:01 +01:00 |
|
jamescarlyle
|
e187c4d91d
|
Further tweaks based on feedback - simplified the embedded timelock contract
|
2016-09-08 22:49:24 +01:00 |
|
Matthew Nesbit
|
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 |
|
Matthew Nesbit
|
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 |
|
Matthew Nesbit
|
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 |
|
Mike Hearn
|
af72978ace
|
Remove redundant import.
|
2016-09-08 14:41:17 +02:00 |
|
Matthew Nesbit
|
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 |
|
Andras Slemmer
|
abe9cfbd67
|
Merged in aslemmer-node-client-models (pull request #307)
Aslemmer node client models
|
2016-09-08 12:31:35 +01:00 |
|
Mike Hearn
|
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 |
|
Mike Hearn
|
d8d639f192
|
Merged in mike-small-tweaks (pull request #337)
A few small tweaks
|
2016-09-08 12:40:14 +02:00 |
|
Andras Slemmer
|
0412a70301
|
client: Rename TransactionCreateState -> GatheredTransactionData, fix compile error after rebase
|
2016-09-08 11:25:26 +01:00 |
|
Andras Slemmer
|
e235375a89
|
client: Add stubs/todo for handling state snapshots
|
2016-09-08 11:25:26 +01:00 |
|
Andras Slemmer
|
3acbda53e4
|
client: AmountBindings class->object
|
2016-09-08 11:25:26 +01:00 |
|
Andras Slemmer
|
2869889769
|
client: Add lengthier explanation of Models
|
2016-09-08 11:25:26 +01:00 |
|
Andras Slemmer
|
6b6c51b8d4
|
client: Elaborate on why we need two IDs in TransactionCreateStateModel
|
2016-09-08 11:25:26 +01:00 |
|
Andras Slemmer
|
d5c4202162
|
client: Fix when (this) to use virtual dispatch instead
|
2016-09-08 11:25:26 +01:00 |
|
Andras Slemmer
|
3a5247f016
|
client: Small tweaks
|
2016-09-08 11:25:26 +01:00 |
|
Andras Slemmer
|
2ef59ff2ba
|
client: Small comment adjustment
|
2016-09-08 11:25:26 +01:00 |
|
Andras Slemmer
|
7eb4f1fb33
|
client: Clarify keyHashCode var name, add unit tests for AggregatedList
|
2016-09-08 11:25:26 +01:00 |
|
Andras Slemmer
|
435754a043
|
client: reactfx->rx
|
2016-09-08 11:25:26 +01:00 |
|
Andras Slemmer
|
4c36072849
|
client: Document fx utilities
|
2016-09-08 11:25:26 +01:00 |
|
Andras Slemmer
|
0c8f58b2ac
|
client: Document models
|
2016-09-08 11:25:26 +01:00 |
|
Andras Slemmer
|
cb956e0979
|
client: Some refactor of Expect dsl, docs
|
2016-09-08 11:25:26 +01:00 |
|
Andras Slemmer
|
bdb22e1b74
|
client: Add javafx utilities and basic WalletMonitor models
|
2016-09-08 11:25:26 +01:00 |
|
Andras Slemmer
|
e36eef8935
|
Merged in aslemmer-node-client-mock (pull request #310)
Aslemmer node client mock
|
2016-09-08 11:24:22 +01:00 |
|