Shams Asari
4b86362391
Merge remote-tracking branch 'open/master' into shams-os-merge-250118
...
# Conflicts:
# client/rpc/src/integration-test/kotlin/net/corda/client/rpc/BlacklistKotlinClosureTest.kt
# client/rpc/src/integration-test/kotlin/net/corda/client/rpc/RPCStabilityTests.kt
# core/src/test/java/net/corda/core/flows/FlowsInJavaTest.java
# docs/source/changelog.rst
# docs/source/corda-configuration-file.rst
# docs/source/upgrade-notes.rst
# finance/src/test/kotlin/net/corda/finance/contracts/CommercialPaperTests.kt
# finance/src/test/kotlin/net/corda/finance/contracts/asset/CashTests.kt
# gradle/wrapper/gradle-wrapper.properties
# node-api/src/main/kotlin/net/corda/nodeapi/internal/KeyStoreConfigHelpers.kt
# node-api/src/test/kotlin/net/corda/nodeapi/internal/serialization/SetsSerializationTest.kt
# node/src/integration-test/kotlin/net/corda/node/AuthDBTests.kt
# node/src/integration-test/kotlin/net/corda/node/BootTests.kt
# node/src/integration-test/kotlin/net/corda/node/NodeKeystoreCheckTest.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/node/services/BFTNotaryServiceTests.kt
# node/src/integration-test/kotlin/net/corda/node/services/RaftNotaryServiceTests.kt
# node/src/integration-test/kotlin/net/corda/node/services/network/NetworkMapTest.kt
# node/src/integration-test/kotlin/net/corda/node/services/network/PersistentNetworkMapCacheTest.kt
# node/src/integration-test/kotlin/net/corda/node/services/statemachine/FlowVersioningTest.kt
# node/src/integration-test/kotlin/net/corda/node/utilities/registration/NodeRegistrationTest.kt
# node/src/integration-test/kotlin/net/corda/services/messaging/MQSecurityTest.kt
# node/src/integration-test/kotlin/net/corda/services/messaging/P2PMessagingTest.kt
# node/src/integration-test/kotlin/net/corda/test/node/NodeStatePersistenceTests.kt
# node/src/main/kotlin/net/corda/node/internal/AbstractNode.kt
# node/src/main/kotlin/net/corda/node/services/config/NodeConfiguration.kt
# node/src/main/resources/reference.conf
# node/src/test/java/net/corda/node/services/vault/VaultQueryJavaTests.java
# node/src/test/kotlin/net/corda/node/CordaRPCOpsImplTest.kt
# node/src/test/kotlin/net/corda/node/services/config/NodeConfigurationImplTest.kt
# node/src/test/kotlin/net/corda/node/services/network/NetworkMapCacheTest.kt
# node/src/test/kotlin/net/corda/node/services/persistence/DBCheckpointStorageTests.kt
# samples/attachment-demo/src/integration-test/kotlin/net/corda/attachmentdemo/AttachmentDemoTest.kt
# samples/network-visualiser/src/main/kotlin/net/corda/netmap/NetworkMapVisualiser.kt
# samples/notary-demo/src/main/kotlin/net/corda/notarydemo/RaftNotaryCordform.kt
# samples/simm-valuation-demo/src/integration-test/kotlin/net/corda/vega/SimmValuationTest.kt
# testing/node-driver/src/integration-test/kotlin/net/corda/testing/driver/DriverTests.kt
# testing/node-driver/src/main/kotlin/net/corda/testing/node/InMemoryMessagingNetwork.kt
# testing/node-driver/src/main/kotlin/net/corda/testing/node/MockNode.kt
# testing/node-driver/src/main/kotlin/net/corda/testing/node/MockServices.kt
# testing/node-driver/src/main/kotlin/net/corda/testing/node/NodeTestUtils.kt
# testing/node-driver/src/main/kotlin/net/corda/testing/node/internal/NodeBasedTest.kt
# testing/smoke-test-utils/src/main/kotlin/net/corda/smoketesting/NodeProcess.kt
# testing/test-utils/src/main/kotlin/net/corda/testing/internal/TestNodeInfoBuilder.kt
# tools/explorer/src/main/kotlin/net/corda/explorer/ExplorerSimulation.kt
# verifier/src/integration-test/kotlin/net/corda/verifier/VerifierTests.kt
# webserver/src/integration-test/kotlin/net/corda/webserver/WebserverDriverTests.kt
2018-01-25 17:51:13 +00:00
Mike Hearn
17a6f61eba
Simplify CashTests and add some comments/convenience APIs to MockServices ( #2241 )
2018-01-25 16:29:26 +01:00
Andrzej Cichocki
1fc646cfa8
CORDA-716 Move test-utils and node-driver to stable API section in docs ( #2335 )
...
* Move test-utils and node-driver to stable section.
* Move FlowStackSnapshotFactory to testing.services package & update docs
* Move SerializationTestHelpers to testing.core package
* Move TestConstants.kt to core namespace
* Move Expect.kt to core namespace
* Move CoreTestUtils to core.TestUtils - rename class and update imports
* Added some clarification to documents after re-reading them
* Added static imports
* Removing unused import
* Fix merge conflict
* Fixing merge conflict
2018-01-22 11:28:41 +00:00
szymonsztuka
f59560bb06
Database schema changes. ( #2389 )
...
Changes compatible with R3.Corda (ENT-794):
1) Added Hibernate corda-wrapper-binary two to to columns.
2) Shorten names of tables in dummy schemas used in tests.
3) Undo removal of compound index of VaultTxnNote (b423fea
2018-01-19 17:09:02 +00:00
Tudor Malene
c2bd7403a8
hibernate mapping changes ( #2337 )
...
* add foreign key names and move the participants mapping to the subclass so that the table name can be configured
* update api-current file
* fix compilation errors
* PR changes
* PR changes
2018-01-10 11:42:08 +00:00
Tudor Malene
0c646ff662
[ENT-1339]: for h2, allow schemas without migrations to run ( #294 ) ( #305 )
...
* [ENT-1339]: for h2, allow schemas without migrations to run (#294 )
* [ENT-1339]: for h2, allow schemas without migrations to run
* [ENT-1339]: fix various migration issues and change author name
* [ENT-1339]: add naming convention for migrations
* [ENT-1339]: change naming convention to use hyphens
* [ENT-1339]: change mapping of participants to be able to control the table name
* [ENT-1339]: change FK names to <=30 for oracle 11g compatibility
* [ENT-1339]: cmd line argument for migrations made consistent
* [ENT-1339]: revert abstract state superclasses
* Update db integration test setup - new tables.
* Update db integration test setup - new tables.
* [ENT-1339]: remove final from participants to allow table name config
* [ENT-1339]: shortened pk
* [ENT-1339]: revert constructor
* [ENT-1339]: change getMigrationResource api to Nullable
2018-01-09 14:44:17 +00:00
Shams Asari
1e9e1a61d9
Moved IntegrationTest class into internal package
2018-01-04 22:08:16 +00:00
Shams Asari
b577b680ff
Merge remote-tracking branch 'open/master' into shams-os-merge-040118
2018-01-04 18:32:15 +00:00
Joel Dudley
63734aa3ed
Harmonises the names of the parameters across CashExitFlow constructors.
2018-01-04 13:35:56 +00:00
Tudor Malene
83efd33fc7
removed unnecessary "display width" db settings that were failing in postgres ( #247 ) ( #251 )
2017-12-22 09:55:33 +00:00
Christian Sailer
a2344f15fb
Unicode columns for SqlServer ( #248 )
...
* ENT-1291 Switch liquibase changelogs to use nvarchar instead of varchar
* Configure Hibernate to use nationalised strings
* Configure Hibernate to use nationalised strings
* Change schema so that UUIDs are varchars
* Update schema certificate signing request status is not unicode
* Upper case suffix for audit tables
* nvarchar -> varchar for status in the audit table
* Capitalisation
* Capitalisation
* Force hibernate to use unicode columns on SQL server
* Force hibernate to use unicode columns on SQL server
* Schema change to make PostgreSql happy
* SQL files to initialise the perfcluster db for SQL server and PostgreSql
* Code ordering and extra comment
2017-12-21 17:34:21 +00:00
Andras Slemmer
107fcf82e3
Fixing stuff
2017-12-18 15:39:08 +00:00
Tudor Malene
066bb767d1
fixing merge errors
2017-12-18 12:40:57 +00:00
josecoll
e9fc6f7c8d
Merge remote-tracking branch 'open/master' into colljos-os-merge-rc01
2017-12-18 10:24:38 +00:00
Andrzej Cichocki
8114a20abd
CORDA-716 Move non-API things to internal ( #2256 )
2017-12-17 18:44:35 +00:00
Tudor Malene
f2194fcfd4
Integrate db migration tool - liquibase ( #150 )
...
[ENT-996]: integrate Liquibase for data migration
2017-12-16 15:58:12 +00:00
Andrzej Cichocki
2652ae111a
CORDA-716 Devrel feedback ( #2266 )
...
* * Document TestIdentity entropy and enforce that it actually works
* Ledger/transaction DSL default notary with fresh key
* MockServices default identity with fresh key
* makeTestIdentityService now takes vararg
* Require cordappPackages for MockServices
* DSL automatic serialization init
* Improve error when two MockNetworks used
* * Make cordappPackages required by MockNetwork
* Default identity service in MockServices
* Make notarySpecs Java-friendly
2017-12-15 19:18:31 +00:00
Andrzej Cichocki
479a656484
CORDA-716 Consistent MockServices API ( #2247 )
...
* Consistent MockServices API.
* Fix compile error.
2017-12-15 13:15:05 +00:00
Andrzej Cichocki
21e1118ea0
Make test constants Java-visible fields. ( #2258 )
2017-12-14 16:30:18 +00:00
Shams Asari
2319bf396c
Renamed TestIdentity.key to keyPair and pubkey to publicKey ( #2249 )
2017-12-14 11:30:55 +00:00
josecoll
4e42fff7d4
Fix broken integration test following rebase from OS master (mostly test utils identity constant redefinitions / renaming)
2017-12-13 12:34:06 +00:00
josecoll
d1998b2c94
Merge remote-tracking branch 'open-hc02/master' into colljos-os-hc02-merge-121217
2017-12-13 11:02:58 +00:00
Andrzej Cichocki
c3b9955344
CORDA-716 Fix split packages in testing ( #2232 )
2017-12-12 19:37:01 +00:00
Andrzej Cichocki
905c8252a6
CORDA-654 Remaining key constants ( #2226 )
2017-12-12 18:03:06 +00:00
Andrzej Cichocki
08bbf9061e
Introduce TestIdentity. ( #2217 )
2017-12-12 15:52:05 +00:00
josecoll
499de12620
Merge remote-tracking branch 'open-hc02/master' into colljos-os-hc02-merge-121217
2017-12-12 11:22:57 +00:00
Andrzej Cichocki
d8c7f0ae23
Inline DUMMY_CASH/OBLIGATION_ISSUER. ( #2214 )
2017-12-11 16:17:20 +00:00
Andrzej Cichocki
544e19e277
CORDA-654 Remove key constants from NodeTestUtils ( #2205 )
...
* DUMMY_NOTARY was hiding in a couple more places
2017-12-11 11:44:01 +00:00
josecoll
8a6e9c52f3
Merge remote-tracking branch 'open-hc01/master' into colljos-os-hc01-merge-111217
2017-12-11 09:21:52 +00:00
Ross Nicoll
ce859178eb
Correct identities passed to generateSpend ( #2199 )
...
Pass well known identities instead of confidential into `generateSpend()`
2017-12-07 18:12:25 +00:00
Andrzej Cichocki
c36bea3af5
CORDA-654 MockServices no longer has hard-coded identities ( #2192 )
...
* Resurrect a test
* Fix a broken test
* Pass in the initial identity
* Make IdentityService easier to mock
2017-12-07 11:55:18 +00:00
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
e4d76204c1
Pass some key constants into MockServices. ( #2173 )
2017-12-05 14:50:56 +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
szymonsztuka
07e46ddb3c
Merge OS to Enterprise - fixes after merge: update SQL Server cash query, test in pertestcordapp module, platform version 1
2017-12-01 00:02:11 +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
a314a6a125
CORDA-654 Simplify TransactionDSL API ( #2152 )
2017-11-30 16:28:44 +00:00
Tudor Malene
5a6f2a19b3
[CORDA-824]: fix resource leak in Cash selection ( #2155 )
...
[CORDA-824]: fix resource leak in Cash selection and some example class
2017-11-30 16:17:18 +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
Andrzej Cichocki
b45d9e957b
CORDA-654 Pass key constants into VaultFiller ( #2118 )
2017-11-29 12:51:01 +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
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
Maksymilian Pawlak
e63b6d1386
CORDA-311 Shell via SSH server ( #2087 )
...
* SSH server integration
2017-11-20 17:41:38 +00:00
Andrzej Cichocki
f26aa33553
Introduce contextLogger ( #2085 )
...
* Revert with comment, probably lazy for a reason.
2017-11-20 11:31:08 +00:00
josecoll
b685537c52
Reverse types for Issuer attributes. ( #2083 )
2017-11-20 10:36:37 +00:00
josecoll
ea1cd0035a
Merge remote-tracking branch 'open/master' into colljos-merge-171117
2017-11-18 11:03:36 +00:00
Shams Asari
332915f08b
Bug fix for cash selection on H2 where the accumulated pennies amount is larger than max int
2017-11-17 18:50:12 +00:00
