b19dac02c4
remove temporary code, reorder lines
2018-05-02 00:11:18 +01:00
1a616b1063
resolve merge conflicts - compilation error, fix integration tests in remote database mode
2018-05-01 23:48:13 +01:00
b25892e45b
resolved conflicts
2018-05-01 21:32:11 +01:00
29615f512e
Close DB after test
...
Add unique node prefix to DB source
2018-05-01 14:37:35 +01:00
597a15a230
Compilation fix
...
Daily DB integration test ignore, to release merge lock and allow for proper refactor
2018-05-01 12:33:13 +01:00
bc77492d45
Compilation fix
2018-05-01 10:48:56 +01:00
b6e610252f
Merge commit 'b210f7ab0ba141a6a02e445741dcdab6f9c5b303' into os-merge-30-04
...
# Conflicts:
# node/src/test/kotlin/net/corda/node/services/vault/VaultQueryTests.kt
2018-04-30 18:22:33 +01:00
416d4ecaeb
ENT-1428 Vault queries - change SQL generation for aggregate function in 'group by' clause. ( #426 )
...
Vault queries: 'order by' function aggregation e.g. 'order by sum(col)' is replaced by the position of the selected column (e.g. 'order by 1').
Rationale: NonStop database doesn't support aggregation function in order by clause e.g. 'order by (sum col_x)'. I couldn't find a way to force Hibernate to produce alias e.g. ' select sum(col_x) as alias_x... order by also_x ...', and the only solution supported by all db an HPE NonStop is to use positional parameter e.g. 'select sum(col_x) as alias_x... order by 1 ...'
2018-04-30 09:45:15 +01:00
c3e6b39e59
artemis upgrade to 2.5.0 ( #3029 )
2018-04-27 19:54:08 +01:00
0cbfab9214
CORDA-1335: Move DistributedServiceTests into a separate package to reduce size of attachments produced. ( #3021 )
2018-04-27 16:47:01 +01:00
efd203e5f3
ENT-1540: Make sure transactions with "expired" time windows get re-notarised correctly ( #3004 )
...
* ENT-1540: Make sure transactions with "expired" time windows get re-notarised correctly.
Currently the time window is checked before states are being passed to a uniqueness provider. If the time window is
invalid, the transaction will be rejected even if it has already been notarised, which violated idempotency.
For this reason the time window verification was moved alongside state conflict checks.
* Update API - this only affects custom notary interfaces
2018-04-27 15:02:09 +01:00
8ce718f4bf
Merge pull request #785 from corda/merges/april-27-09-38
...
Merges: April 27th at 09:38
2018-04-27 17:26:50 +07:00
70b32636b5
Merge remote-tracking branch 'remotes/open/master' into merges/april-27-09-38
...
# Conflicts:
# docs/source/changelog.rst
# node-api/src/main/kotlin/net/corda/nodeapi/internal/config/ConfigUtilities.kt
# node/src/main/kotlin/net/corda/node/services/config/NodeConfiguration.kt
2018-04-27 10:12:15 +01:00
df5d45a4a6
Enable integration tests to run doorman against remote database (part of ENT-1447) ( #776 )
...
Change integration tests in remote database mode infrastracture to allow passing parameterised dataSource configuration to doorman. Add doorman tables to SQL clearup scripts.
2018-04-27 09:57:16 +01:00
b210f7ab0b
DB test using transaction with rollback rather then recreating whole DB ( #2994 )
...
VaultQuery tests wrapped inside transaction which gets rolled back rather then recreating DB from scratch for each test
Moved Missing schema test to separate class, as it modifies global test class state
2018-04-27 09:52:25 +01:00
235df69efe
[CORDA-1379]: Allow soft trapping of unknown config keys. ( #3011 )
2018-04-27 15:33:13 +07:00
aecde00365
CORDA-1001 Remove unused bits of PersistentMap ( #3001 )
...
* Remove unused bits of PersistentMap
* Add persistent map tests
* Reivew comments
2018-04-26 21:58:01 +01:00
61d2212840
Merge remote-tracking branch 'open-source/master' into thomas-merge
...
experimental/behave/src/main/kotlin/net/corda/behave/logging/LogUtilities.kt
node/src/main/kotlin/net/corda/node/services/config/NodeConfiguration.kt
node/src/test/kotlin/net/corda/node/services/config/NodeConfigurationImplTest.kt
node/src/test/kotlin/net/corda/node/services/messaging/ArtemisMessagingTest.kt
2018-04-26 14:47:29 +01:00
2ff3939e2e
Add exponential backoff to P2P messaging retry ( #2975 )
2018-04-26 13:58:41 +01:00
266b96f99c
Merge commit '88c12791a81a49bdaab93e6bda4d070d7bf1ac5c' into aslemmer-merge-88c12791a81a49bdaab93e6bda4d070d7bf1ac5c
2018-04-26 10:01:30 +01:00
999048db48
Merge pull request #772 from corda/mike-merge-4cfb1606da
...
Merge to 4cfb1606da
2018-04-26 09:27:25 +02:00
7ad19af93f
CORDA-1353: Notaries should reject transactions that contain too… ( #2986 )
...
CORDA-1353: Notaries should reject transactions that contain too many inputs. Otherwise, it may cause a slowdown or make the service hang.
2018-04-25 17:29:19 +01:00
e09fc60294
Improved error message on net parameters mismatch during node startup ( #3003 )
2018-04-25 14:33:07 +01:00
f5483d1deb
ENT-1577 - Remove exposure of internal classes via test api ( #516 )
...
* Remove exposures of internal classes via testing api
* Remove deleted api from api-current
* Fix merge conflict
* Remove internal usage from api-current.txt
2018-04-25 11:59:20 +01:00
29dbe6ab53
Add flow-id to MDC
2018-04-25 10:36:50 +01:00
f1da044c86
Remove double wrap
2018-04-25 10:36:40 +01:00
f99d16eebb
Merge remote-tracking branch 'open/master' into mike-merge-4cfb1606da
2018-04-25 10:43:23 +02:00
03fb9d4be2
CORDA-1354 Check for jars in nested folders (to add in classpath) ( #2981 )
...
+ edge cases (logging if we don't have permission to jar folders)
2018-04-24 18:43:07 +01:00
e135cf062c
Merge commit '5f70b6e04954a6dc64a1a56089eeccb2966bb0ae' into chrisr3-os-merge
2018-04-24 18:09:41 +01:00
8e507d0b88
CORDA-1263: Replace deprecated kotlin-stdlib-jre8 with kotlin-stdlib-jdk8. ( #2992 )
2018-04-24 14:03:41 +01:00
f7e068b842
Merge commit '10c559a3f3dc1cc8055e3204cd289468fbf3e644' into aslemmer-merge-10c559a3f3dc1cc8055e3204cd289468fbf3e644
2018-04-24 11:19:01 +01:00
67f5bcc38e
Merge commit '640e5c60886b23068162205db82b1ae5c7c7eec8' into aslemmer-merge-640e5c60886b23068162205db82b1ae5c7c7eec8
2018-04-24 11:01:21 +01:00
b0d2a258c0
cherry-pick 7759fdbb71ea9b2021afd8af0ac05447c5305b3a
2018-04-24 09:36:57 +01:00
8689d022ca
Merge fixes
2018-04-23 15:52:37 +01:00
5f781193b6
Merge remote-tracking branch 'open/master' into os-merge-d3446e2
...
# Conflicts:
# node/src/integration-test/kotlin/net/corda/node/BootTests.kt
# node/src/integration-test/kotlin/net/corda/node/services/AttachmentLoadingTests.kt
# node/src/main/kotlin/net/corda/node/services/statemachine/FlowStateMachineImpl.kt
# testing/smoke-test-utils/src/main/kotlin/net/corda/smoketesting/NodeProcess.kt
# tools/demobench/src/main/kotlin/net/corda/demobench/model/NodeController.kt
2018-04-23 15:50:24 +01:00
6bf34ed5c7
Fix bugs
2018-04-23 15:36:16 +01:00
5b4fd6fe64
Address comments
2018-04-23 15:36:16 +01:00
57caf9af28
Cherry pick 34f8719363
2018-04-23 15:36:16 +01:00
19dad6da96
Add back deprecated functions
2018-04-23 15:36:16 +01:00
ce5fb66260
StateMachine rewrite
2018-04-23 15:36:16 +01:00
d3446e213c
Introduced a few more extension methods to Path, which are clearer than the static methods in Files. ( #2985 )
...
Also migrated code away from the old File API.
2018-04-23 14:31:49 +01:00
15c015e0d6
Merge branch 'master' into colljos-merge-230418
2018-04-23 12:12:16 +01:00
bf4d8ba08c
CORDA-1335: Scan attachment Jar only to speed-up the process. ( #2982 )
...
* CORDA-1335: Scan attachment Jar only to speed-up the process.
* CORDA-1335: Explicitly mention other types of contracts to scan.
* CORDA-1335: Refactor to eliminate listing different subclasses of Contract in two separate places.
2018-04-23 09:17:43 +01:00
af77c5a287
Merge remote-tracking branch 'open/master' into anthony-os-merge-20180418
...
# Conflicts:
# constants.properties
# docs/source/changelog.rst
2018-04-18 11:24:22 +01:00
7db48de2b8
CORDA-1344 Fix query paging in scheduled flow tests ( #2970 )
...
* Fix paging tests, move out of scheduled flow tests and provide java example
* Fix a few issues with docs
2018-04-18 11:10:21 +01:00
7789d5475f
Revert node suspend and resume ( #744 )
2018-04-17 15:14:58 +01:00
b6d43c0204
Merge remote-tracking branch 'open/master' into os-merge-1288f63
...
# Conflicts:
# constants.properties
# node/src/main/kotlin/net/corda/node/internal/cordapp/CordappConfigProvider.kt
# samples/cordapp-configuration/src/main/kotlin/net/corda/configsample/ConfigSampleFlow.kt
2018-04-16 17:35:43 +01:00
1288f63998
Fixed the CorDapp configuration demo ( #2967 )
2018-04-16 17:23:11 +01:00
34f8719363
ENT-1766 Release soft locks inside the database transaction ( #737 )
2018-04-16 13:51:50 +01:00
a0bf0261bb
Merge commit 'd8bf1019b6c7ddbe709cff7c730e66eb576f9ad5' into christians/merge-CORDA-1336
2018-04-13 16:39:00 +01:00
