szymonsztuka
cb43091ff8
Merge Open Source into Enterprise
...
# Resolved conflicts:
# core/src/main/kotlin/net/corda/core/node/services/TransactionStorage.kt
# node/src/integration-test/kotlin/net/corda/node/BootTests.kt
# node/src/integration-test/kotlin/net/corda/node/CordappScanningDriverTest.kt
# node/src/integration-test/kotlin/net/corda/node/NodePerformanceTests.kt
# node/src/integration-test/kotlin/net/corda/node/SSHServerTest.kt
# node/src/integration-test/kotlin/net/corda/node/services/AttachmentLoadingTests.kt
# node/src/integration-test/kotlin/net/corda/test/node/NodeStatePersistenceTests.kt
# node/src/main/kotlin/net/corda/node/Corda.kt
# node/src/main/kotlin/net/corda/node/internal/AbstractNode.kt
# node/src/main/kotlin/net/corda/node/internal/StartedNode.kt
# node/src/test/kotlin/net/corda/node/services/events/NodeSchedulerServiceTest.kt
# samples/attachment-demo/src/integration-test/kotlin/net/corda/attachmentdemo/AttachmentDemoTest.kt
# samples/trader-demo/src/integration-test/kotlin/net/corda/traderdemo/TraderDemoTest.kt
# testing/node-driver/src/main/kotlin/net/corda/testing/NodeTestUtils.kt
# testing/node-driver/src/main/kotlin/net/corda/testing/internal/NodeBasedTest.kt
# testing/node-driver/src/main/kotlin/net/corda/testing/node/MockServices.kt
2017-12-05 17:35:54 +00:00
Andrzej Cichocki
b0ebf3d7e0
CORDA-654 Various MockServices refactorings ( #2167 )
...
* Remove MockServices.stateMachineRecordedTransactionMapping which does nothing
* Inline StateLoaderImpl
* Remove unused MockServices
* MockServices well-known identities not needed in a place
* A few things don't need a full-blown ServiceHub
2017-12-05 16:22:53 +00:00
Andrzej Cichocki
e4d76204c1
Pass some key constants into MockServices. ( #2173 )
2017-12-05 14:50:56 +00:00
cburlinchon
c87f37af3e
ENT-1127 mutual exclusion so a node cannot start if another is running ( #111 )
...
* Dont lock row
* Add config for RunOnceService
* Don't invalidate Hibernate L2 cache on native queries
* Change column names to avoid name clash
2017-12-05 14:46:35 +00:00
Andras Slemmer
8fb0db1908
SSH test workaround
2017-12-05 12:16:32 +00:00
Andras Slemmer
63027a077d
State machine rewrite
2017-12-05 11:36:20 +00:00
Alberto Arri
b6427a3128
remove calls to exitnodes from NodeStartup ( #2080 )
2017-12-04 15:44:18 +00:00
Andrzej Cichocki
d2f66acff7
Use non-static Rx pool when testing. ( #2165 )
2017-12-04 12:41:43 +00:00
Shams Asari
5264072752
Renamed n.c.nodeapi.config to n.c.nodeapi.internal.config as that config code is not public API. For the same reason, also moved User into the same internal package.
2017-12-03 17:20:30 +00:00
szymonsztuka
709b3791a3
SQL Azure and SQL Server database integration tests ( #115 )
...
* Integration test are parameterised (extends IntegrationTest) to run against a remote database with 4 db scripts run @BeforeClass, @Before, @After and @AfterClass.
* SQL script for SQL Azure and SQL Server databases and templates of JDBC configuration.
2017-12-01 17:17:51 +00:00
Andrzej Cichocki
15f677a2fb
Make rigorousMock callRealMethod by default for concrete methods. ( #2159 )
2017-12-01 10:10:27 +00:00
szymonsztuka
2bdd8b681d
Merge OS to Enterprise.
...
Main differences preserved in Enterprise version:
* constants.properties: platform version 1 (OS has 2)
* gradle-wrapper.properties: higher Gradle version gradle-4.3.1 (OS has gradle-4.3)
* Driver.kt - setting system property "user.dir"
2017-11-30 23:54:12 +00:00
Andrzej Cichocki
10e686bc82
Inline DriverConstants. ( #2156 )
2017-11-30 16:28:58 +00:00
Andrzej Cichocki
a314a6a125
CORDA-654 Simplify TransactionDSL API ( #2152 )
2017-11-30 16:28:44 +00:00
igor nitto
0db7dce985
Dynamic registration of RPC users security roles in ArtemisMessagingS… ( #2140 )
...
Dynamic registration of RPC users security roles in ArtemisMessagingServer [ENT-1000]
2017-11-30 15:06:53 +00:00
Shams Asari
286ff65e60
Merge pull request #2147 from corda/shams-doorman-node-persistence-deps
...
Moved CordaPersistence and dependent classes into internal package in…
2017-11-29 17:51:35 +00:00
Andrzej Cichocki
3c31fdf31d
CORDA-806 Remove initialiseSerialization from rpcDriver ( #2084 )
...
and fix a leak or two
2017-11-29 17:42:39 +00:00
Shams Asari
b638b30d2a
Moved CordaPersistence and dependent classes into internal package in node-api. This is so that the doorman can make use of them without needing a compile dependency to node.
2017-11-29 17:14:05 +00:00
Shams Asari
5c53a91785
Overhaul of the Bank of Corda demo to fix two problems it had:
...
1. The runRPCCashIssue and runWebCashIssue gradle tasks didn't work because they were using the wrong ports
2. Notary lookup was failing because the lookup name didn't include the correct CN for the notary name (this slipped through when reverting the network parameters)
The ports change occurred in #1922 which was attempting the fix the runIssuer gradle task. This is actually a misleading and redundant task as all it does is start up the nodes, which is what the documented deployNodes already does. The ports runIssuer allocated to the nodes were different to the ones specified in deployNodes.
To make sure we have integration tests which closely match deployNodes, the BoC demo has been updated to make use of CordformDefinition. This keeps the node definitions in one place, removing the need to have disparate files in sync. runIssuer has been removed.
2017-11-29 14:48:05 +00:00
Tudor Malene
f264b62823
ENT-1144 - rename "link_nodeinfo_party" table to "node_link_nodeinfo_… ( #135 )
...
* ENT-1144 - rename "link_nodeinfo_party" table to "node_link_nodeinfo_party"
2017-11-29 13:23:53 +00:00
Andrzej Cichocki
b45d9e957b
CORDA-654 Pass key constants into VaultFiller ( #2118 )
2017-11-29 12:51:01 +00:00
szymonsztuka
c32c21bc48
[ENT-1153] fix merge - revert feature for database integration test (Enterprise feature)
2017-11-29 10:51:49 +00:00
Andrzej Cichocki
dbe2dca7b9
CORDA-654 Make VaultFiller a class so I can change its hardcoded bits ( #2141 )
2017-11-29 09:49:34 +00:00
Michele Sollecito
cb1fa2e017
Corda now works with H2 without the need to allow Hibernate to create the database automatically. ( #2124 )
...
[CORDA-815]: Corda now instructs Hibernate to either adjust or validate the schema based on `devMode` property.
Also renamed property `database.initDatabase` to `database.createSchemaAutomatically`.
* [CORDA-815]: Renamed database.initDatabase to database.adjustSchemas.
* Code review changes: removed property `database.initDatabase` altogether.
* Code review changes: removed property `database.initDatabase` altogether.
* Code review changes: removed property `database.initDatabase` altogether.
* Code review changes: removed property `database.initDatabase` altogether.
2017-11-28 17:33:02 +00:00
Andrzej Cichocki
ff9e7474b1
CORDA-654 Make MOCK_IDENTITIES less special ( #2114 )
...
* Make rigorousMock usable from Java
* Show args in mock failure message
2017-11-28 11:35:59 +00:00
Tudor Malene
7d75d95dc2
[ENT-1153]: fix merge
2017-11-28 10:42:40 +00:00
bpaunescu
614779d4ec
ENT-1128 fix node restarts when using AzureSQLServer ( #2139 )
2017-11-28 10:32:30 +00:00
Andrzej Cichocki
4bd6fef0f9
StateMachineManager is no longer lateinit. ( #2123 )
2017-11-27 17:55:08 +00:00
Shams Asari
4ca54b73fe
Added tests to make sure the platform version is correctly available
2017-11-27 17:04:19 +00:00
Tudor Malene
a982bb2ae6
[ENT-1153]: fix merge
2017-11-27 16:55:06 +00:00
Tudor Malene
e8d833c2fe
Merge remote-tracking branch 'open/master' into features/ENT-1153/merge_OS2ENT
...
# Conflicts:
# .idea/compiler.xml
# docs/source/changelog.rst
# node/src/test/kotlin/net/corda/node/services/transactions/DistributedImmutableMapTests.kt
# testing/node-driver/src/main/kotlin/net/corda/testing/NodeTestUtils.kt
# testing/node-driver/src/main/kotlin/net/corda/testing/node/MockServices.kt
2017-11-27 16:52:29 +00:00
Shams Asari
2ceb6283af
Moved X509Utilities, and some other crypto utilities in node, into node-api so that they can be used by services outside of the node.
...
There's also some cleanup as well.
2017-11-27 15:49:33 +00:00
Shams Asari
1705df4d1f
Made the database config option typesafe, rather than relying on String properties
2017-11-27 13:51:53 +00:00
Andrzej Cichocki
449155cea3
IdentityService is no longer obtained lazily. ( #2130 )
2017-11-27 12:34:33 +00:00
Maksymilian Pawlak
ce9b6c1f18
CORDA-311-post PR merged fixes ( #2106 )
...
* SSH server integration
2017-11-23 16:34:57 +00:00
Konstantinos Chalkias
502d0df630
Mutual TLS auth - mixed RSA and ECDSA keys ( #2095 )
2017-11-23 16:07:08 +00:00
Tudor Malene
cdf061379e
ENT-1142 - added ddl scripts for postgres and missing idx to sqlserver ( #127 )
2017-11-23 15:59:59 +00:00
Tudor Malene
99d042ecd3
Add sqlserver ddl scripts ( #126 )
...
sqlserver ddl for corda core and cordapps
2017-11-22 16:19:20 +00:00
szymonsztuka
175bceb5e8
SQL Azure database compatibility ( #113 )
...
* Coin selection for SQL Server/Azure
* Transaction isolation level change for updateInfoDB in PersistentNetworkMapCache from "repeatableRead" to "readCommitted"
* Configuration option to prefix all Hibernate generated SQL with a schema name via a configuration property `database.schema`
* Fix negative value in SELECT TOP query (fix for Oracle db)
2017-11-22 12:28:38 +00:00
szymonsztuka
0f8baae962
Merge opensource into master
2017-11-21 18:53:14 +00:00
Andrzej Cichocki
288eb5fcc4
CORDA-716 Call stop on InMemoryMessagingNetwork ( #2077 )
...
* Inline code used by only 1 test
* Remove superfluous interface
* Warnings crusade
* Inline Builder, remove unused method
* Remove stop from interface
* Register stops up-front
2017-11-21 12:49:21 +00:00
bpaunescu
15dbbb2de9
remove NodeState and nodeStateObservable remnants ( #2102 )
2017-11-21 12:03:51 +00:00
szymonsztuka
ad9f335dde
Consistent database columns naming convention. ( #2097 )
2017-11-21 09:57:38 +00:00
bpaunescu
c467a056ae
Revert CORDA-296: added rpc that returns an observable for node state ( #2091 )
...
* Revert "CORDA-296: added rpc that returns an observable for node state (#2004 )"
This reverts commit 7d1f7ab#2004 )"
This reverts commit 7d1f7ab
2017-11-21 09:52:17 +00:00
Maksymilian Pawlak
e63b6d1386
CORDA-311 Shell via SSH server ( #2087 )
...
* SSH server integration
2017-11-20 17:41:38 +00:00
Rick Parker
6a2c170b82
Additional index to vault_states table to stop a table scan. ( #2093 )
2017-11-20 16:49:17 +00:00
Richard Green
d84e9aab7b
Added exception if same attachment uploaded. Added test
2017-11-20 16:41:41 +00:00
Andrzej Cichocki
f26aa33553
Introduce contextLogger ( #2085 )
...
* Revert with comment, probably lazy for a reason.
2017-11-20 11:31:08 +00:00
Alberto Arri
273965f17a
remove cordacon code ( #2082 )
2017-11-20 11:24:19 +00:00
Mike Hearn
49cdad58c7
Minor: Add a brief comment to the RPC role setup code that explains the security justification for it.
2017-11-20 11:54:23 +01:00
