Commit Graph

10541 Commits

Author SHA1 Message Date
2921b8044d Ack unhandled messages when recipient flow is shut or shutting down (#335) 2018-01-10 17:55:08 +00:00
4caf6d92ea ENT-1350 unifying the config-file command line argument (#333)
* ENT-1350 unifying the config-file command line argument

* Changing README.md
2018-01-10 16:27:59 +00:00
12546c0a7c [ENT-1281]: Disable database.runMigration by default and enforce database version on startup. (#264)
* [ENT-1281]: set database.runMigration=false by default and add state check at startup

* [ENT-1281]: attempt to fix tests

* [ENT-1281]: attempt to fix tests

* [ENT-1281]: set runMigration=true in the cordformation plugin

* [ENT-1281]: attempt to fix tests

* [ENT-1281]: attempt to fix tests

* [ENT-1281]: attempt to fix tests

* [ENT-1281]: fix formatting

* [ENT-1281]: typo and javadocs

* [ENT-1281]: small refactoring and added test for SchemaMigration

* [ENT-1281]: update documentation to reflect changes

* [ENT-1281]: fix tests after merge

* [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

* fix compile error

* [ENT-1281]: fix tests after merge

* [ENT-1281]: fix tests after merge
2018-01-10 11:32:24 +00:00
3c8ebdedae ENT-1355 Rejecting all registration requests, if there is already an entry with the same name (#310) 2018-01-10 10:57:07 +00:00
1e2cc3e2df Database integration tests - added NotaryService schema to database setup. (#328)
* Added NotaryService schema to database setup for two integration tests.
* SQL Server setup scripts - create Login only if not preset (as it's done for Azure SQL).
2018-01-10 10:56:55 +00:00
c7487a8696 Enable deserialisation for certain package from Oracle database drivers. (#298)
* Oracle database drivers ojdbc7.jar and ojdbc8.jar use deserialisation which is disabled by the default in Corda. Added an Oracle package to serialFilter when the node uses Oracle database.
2018-01-09 18:25:54 +00:00
40edc286f5 Transaction creation performance (#303) (#320)
* Default autoCommit to false, remove setting of autocommit and only set isolationLevel if it's changed.

* Set default transaction isolation from database config
2018-01-09 17:17:10 +00:00
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
a65db712c7 ENT-1226 Check minimum platform version when submitting node info (#300)
* Adding min platform version check when submitting node info

* Return error message to developer

* Fixing integration test

* Added todo to move checks out of data layer

* Added extra logging in nodeinfowebservice and use nodeinfo.verified instead of deserialize

* Tidy up tests

* Cache network parameters

* Add NodeInfoWithSigned class to stop calling to only verify node data once

* Fixing review comments

* Return correct response code if doorman not initialised properly

* Fix merge conflict
2018-01-09 13:31:26 +00:00
2832eb489b Replaced DoormanIntegrationTest with NodeRegistrationTest which does a simple end-to-end registration test using the node driver. (#279) 2018-01-08 21:45:39 +00:00
bbcdb639ab Merge pull request #317 from corda/shams-os-merge-080118
Shams O/S merge 080118
2018-01-08 14:43:48 +00:00
f2186e7e30 Enable database integration tests against Postgres database (#169)
* For Postgres, if a schema name is provided then it's wrapped in double quotes before passing to Hibernate to preserve case-sensitivity, Liquibase does it out-of-box.
* Sql setup scripts for PostgreSQL and datasource configuration.
2018-01-08 14:05:42 +00:00
a94f99781a Merge remote-tracking branch 'open/master' into shams-os-merge-080118
# Conflicts:
#	node/src/integration-test/kotlin/net/corda/node/services/AttachmentLoadingTests.kt
#	node/src/integration-test/kotlin/net/corda/node/services/DistributedServiceTests.kt
#	node/src/test/kotlin/net/corda/node/services/events/NodeSchedulerServiceTest.kt
2018-01-08 13:43:10 +00:00
e92ce3ad37 Add correct value of maxMessageSize
For network-parameters.conf in network management
2018-01-08 12:54:51 +00:00
c5149bab9f Backport of ENT-1303 applied to 3.0-RC3 (#2332) 2018-01-08 12:11:55 +00:00
5924427659 Make additionalcorddapps property on cordform node internal (#2329) 2018-01-08 11:54:41 +00:00
98a12c92d5 Fix database integration tests after OS->Ent merge (#295)
* Add more db schemas to NodeRegistrationTest
* Add tables to drop
2018-01-08 11:14:57 +00:00
83a0a2fa3c Enum evolution documentation (#2189)
* CORDA-553 - Documentation

* CORDA-553 - Documentation

* Review comments

* review comments

* DOCUMENTATION: Serilization docs review updates
2018-01-05 19:30:17 +00:00
6a07576c96 CORDA-834 - Class default evolution serialisation documentation (#2209)
CORDA-834 - Class default evolution serialisation documentation
2018-01-05 17:44:53 +00:00
e2286a75e5 CORDA-902 - Serialization documentation (#2323)
CORDA-902 - Serialization documentation
2018-01-05 17:34:32 +00:00
dad207ef7d Merge pull request #292 from corda/shams-os-merge-040118
Shams os merge 040118
2018-01-05 17:13:17 +00:00
37e0830b7d Merge pull request #2317 from corda/kat/feature/setterConstructAMQP
CORDA-902 - AMQP Setter Construction when empty / no constructor
2018-01-05 16:37:23 +00:00
9d66214f4a CORDA-891 Convert NodeSchedulerServiceTest into a unit test (#2273) 2018-01-05 16:34:03 +00:00
3bf84ebbd4 Review Comments 2018-01-05 15:50:24 +00:00
f230e2670b REVIEW COMMENTS 2018-01-05 15:50:24 +00:00
f4ad8d3e70 CORDA-902 - AMQP Setter Construction when empty / no constructor 2018-01-05 15:50:24 +00:00
7856eb158c Merge pull request #2327 from corda/REMOVE_FLAKEY_TESTS
REMOVING FLAKEY TESTS TILL THEYRE STABILISED
2018-01-05 15:49:23 +00:00
52e42ce22f Merge remote-tracking branch 'origin/master' into shams-os-merge-040118 2018-01-05 15:20:19 +00:00
a83f4fd61b Changing network parameters to use node info files instead of by hand… (#288)
* Changing network parameters to use node info files instead of by hand specification of notary

* Addressing review comments

* Different names for notaries

* Updating README
2018-01-05 15:10:34 +00:00
ab76ef4deb REMOVING FLAKEY TESTS TILL THEYRE STABILISED 2018-01-05 15:05:10 +00:00
2cb71ff649 Merge fixes 2018-01-05 14:38:53 +00:00
3b0694af24 Merge branch 'master' into shams-os-merge-040118 2018-01-05 14:16:54 +00:00
74c2eb8a0a Merge remote-tracking branch 'open/master' into shams-os-merge-040118
# Conflicts:
#	node/src/integration-test/kotlin/net/corda/node/AuthDBTests.kt
#	node/src/integration-test/kotlin/net/corda/node/SSHServerTest.kt
2018-01-05 14:13:36 +00:00
694721e8ba TEMP removal of SSH tests till they're made determinsitic (#2325) 2018-01-05 14:07:55 +00:00
a639839a68 ENT-1188 - Clean-up dependencies (SGX) (#166)
* ENT-1188 - Remove unused scripts and dependencies

* ENT-1188 - Update references to removed scripts

* ENT-1188 - Clean up Makefile for container build of SGX JVM

* ENT-1188 - Group udev rules into separate folder

* ENT-1188 - Remove old references to dependencies folder
2018-01-05 12:03:29 +00:00
00b570df29 Improve RPC security test coverage [CORDA-827] (#2320)
* Added test cases covering encrypted password usage
 * Renamed UserAuthServiceTests as AuthDBTests: the integration tests checking user credentials loaded from external database (still limited to H2 in-memory for now).
 * Some internal renamings
2018-01-05 11:50:21 +00:00
cc6113ff06 Merge remote-tracking branch 'open/master' into shams-os-merge-040118
# Conflicts:
#	gradle-plugins/cordformation/src/main/kotlin/net/corda/plugins/Node.kt
2018-01-05 10:09:12 +00:00
1661cea816 CORDA-892: Make cordform test use new network bootstrapper logic (#2307)
* Make cordform test use new network bootstrapper logic

* Fixing review comments

* Fix issue with backwards compatibility

* Fix issue with setup not being called from CordformDefinitions

* Make sure node dir is created (as CordformDefinition uses it directly if setup is overridden
Make sure tmp dir is created

* Don't crash if node dir is already created

* Stop overwriting errors
2018-01-05 09:21:59 +00:00
1e9e1a61d9 Moved IntegrationTest class into internal package 2018-01-04 22:08:16 +00:00
b577b680ff Merge remote-tracking branch 'open/master' into shams-os-merge-040118 2018-01-04 18:32:15 +00:00
133fd27222 Merge fixes and updated network-management to work with the move away from X509CertificateHolder 2018-01-04 18:30:21 +00:00
00a02b30fe Update link for Corda API strategy documentation. (#2316) 2018-01-04 18:05:06 +00:00
48be562a2a ECDSA entropyToKeyPair + no idempotent signatures (#2210) 2018-01-04 17:52:31 +00:00
259eef8838 Merge pull request #2314 from corda/spellerrorfix
SPELLING ERROR FIX - It's -> Its
2018-01-04 16:46:29 +00:00
01e4880947 SPELLING: updae error message in tests 2018-01-04 15:49:55 +00:00
63734aa3ed Harmonises the names of the parameters across CashExitFlow constructors. 2018-01-04 13:35:56 +00:00
412fead02e CORDA-785: Add functions for constructing FlowLogicRef without the class (#2134)
Add functions for constructing `FlowLogicRef` from class name, rather than requiring the class itself. This avoids requiring that schedulable states have access to the scheduled flow to instantiate, but instead can require it only actually scheduling the flow. This reduces the size of the JAR required to validate transactions containing these states.
2018-01-04 13:32:10 +00:00
13619df0b1 Merge remote-tracking branch 'open/master' into shams-os-merge-040118
# Conflicts:
#	node/src/integration-test/kotlin/net/corda/node/utilities/registration/NodeRegistrationTest.kt
#	testing/node-driver/src/main/kotlin/net/corda/testing/node/MockServices.kt
#	testing/test-utils/src/main/kotlin/net/corda/testing/dsl/TransactionDSLInterpreter.kt
2018-01-04 10:58:44 +00:00
8a3299fa2a CORDA-716 Configure api scanner for test modules (#2259) 2018-01-04 10:09:04 +00:00
6d485a3329 SPELLING ERROR FIX 2018-01-04 10:03:04 +00:00