IgorNitto
0a0c8538c4
Merge from Corda/OS
2018-03-14 17:24:47 +00:00
igor nitto
2cff495553
Remove CordApps JARs from node classpath [CORDA-1135] ( #2691 )
2018-03-14 16:42:23 +00:00
Michele Sollecito
da1afd9c55
Introduced copyright in all source files. ( #519 )
2018-03-06 17:29:21 +00:00
sollecitom
36cd34bff5
Merge remote-tracking branch 'remotes/open/master' into merges/march-1-15-20
...
# Conflicts:
# docs/source/corda-configuration-file.rst
# docs/source/release-notes.rst
# node/src/main/kotlin/net/corda/node/internal/NodeStartup.kt
# node/src/main/kotlin/net/corda/node/services/config/NodeConfiguration.kt
# tools/demobench/src/test/kotlin/net/corda/demobench/model/NodeConfigTest.kt
# tools/explorer/README.md
# tools/explorer/src/main/kotlin/net/corda/explorer/ExplorerSimulation.kt
2018-03-01 15:36:40 +00:00
Michele Sollecito
b580a2ac30
[CORDA-926]: Parsing NodeConfiguration will now fail if unknown properties are present. ( #2484 )
2018-03-01 14:57:36 +00:00
Anthony Keenan
c72b3ad4fa
Merge remote-tracking branch 'open/master' into anthony-os-merge-2
...
# Conflicts:
# .ci/api-current.txt
# client/jfx/src/integration-test/kotlin/net/corda/client/jfx/NodeMonitorModelTest.kt
# client/rpc/src/integration-test/kotlin/net/corda/client/rpc/FlowsExecutionModeRpcTest.kt
# docs/source/example-code/src/integration-test/kotlin/net/corda/docs/IntegrationTestingTutorial.kt
# docs/source/example-code/src/main/kotlin/net/corda/docs/tutorial/mocknetwork/TutorialMockNetwork.kt
# finance/src/test/kotlin/net/corda/finance/flows/CashPaymentFlowTests.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/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/rpc/RpcSslTest.kt
# node/src/integration-test/kotlin/net/corda/node/services/statemachine/FlowVersioningTest.kt
# node/src/integration-test/kotlin/net/corda/node/services/statemachine/LargeTransactionsTest.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/test/kotlin/net/corda/node/CordaRPCOpsImplTest.kt
# node/src/test/kotlin/net/corda/node/modes/draining/ScheduledFlowsDrainingModeTest.kt
# node/src/test/kotlin/net/corda/node/services/messaging/ArtemisMessagingTest.kt
# node/src/test/kotlin/net/corda/node/services/statemachine/FlowFrameworkTests.kt
# node/src/test/kotlin/net/corda/node/services/transactions/MaxTransactionSizeTests.kt
# samples/trader-demo/src/integration-test/kotlin/net/corda/traderdemo/TraderDemoTest.kt
# testing/node-driver/src/main/kotlin/net/corda/testing/node/InMemoryMessagingNetwork.kt
# testing/node-driver/src/main/kotlin/net/corda/testing/node/MockServices.kt
# testing/node-driver/src/main/kotlin/net/corda/testing/node/internal/NodeBasedTest.kt
# verifier/src/integration-test/kotlin/net/corda/verifier/VerifierTests.kt
2018-02-28 16:55:15 +00:00
Anthony Keenan
577033441a
[CORDA-1035] Testing api KDoc Updates ( #2584 )
...
* Testing api KDoc Updates
* Update after code review
* Update api-current
* Revert changes to compiler.xml
* Made comment changes from review
* Fixing merge conflict
* Don't expose net.corda.node through test API (first pass)
* Fixing merge conflicts
* Update api-current
* Addressing review commits
* Fix exposure of internal implementation of MessageHandlerRegistration
* Make InProcess expose ServiceHub instead of internal StartedNodeServices
* Move InternalMockMessaginService interface to internal namespace
* Move MOCK_VERSION_INFO to internal namespace to avoid exposing VersionInfo
* Don't expose WritableTransactionStorage via testing api
* Create public VerifierType enum
* Update api-current and modify check-api-changes to check for net.corda.node exposures
* Fix merge conflicts
* Fixing another merge conflict
* Fix accidentally broken unit tests
* Make getInternalServices a property
* Fix failing unit tests
* Add todo to check-api-changes
* Fix rpc sender thread busy looping
* Fix tests
* Fixing tests
* Address mike's comments
* Fixing tests
* Make random port allocation internal
* Update api
2018-02-28 13:26:49 +00:00
Andras Slemmer
25263c20c7
Merge remote-tracking branch 'open/master' into aslemmer-merge-19-Feb
2018-02-20 15:52:09 +00:00
Andras Slemmer
6b2b7b6a3c
Merge commit 'fa4b5d16ba6249f85b50851c2f52dc697eebdee6' into aslemmer-merge-19-Feb
2018-02-20 13:26:31 +00:00
Andras Slemmer
1d7b0fc499
Merge commit '86fb1ed852c69121f989c9eeea92cfb4c27f9d13' into aslemmer-merge-19-Feb
2018-02-19 16:14:43 +00:00
Matthew Nesbit
b8fa44d721
The IRS demo has a clash between web server ports and the regulator node on port 10010. This bumps the ports up by 1 to fix the issue. ( #2562 )
2018-02-16 18:17:15 +00:00
Maksymilian Pawlak
b91dd43a83
Test driver default parameters removal ( #2519 )
...
* Removed long parameter list in test driver, replaced with DriverParameters object
2018-02-13 13:15:05 +00:00
Joel Dudley
ad1be79900
Reorders params to put non-default args first. Creates simpler default constructors.
2018-02-12 17:02:34 +00:00
Anthony Keenan
8081ee42ad
CORDA-939 - Dont expose FlowStateMachine via public API ( #2438 )
...
* Create CordaInternal attribute for properties on public classes that are not part of the api and apply to FlowLogic.stateMachine
* Remove startFlow from public test api and replace with startFlowAndReturnFuture
* Update api-current with changed signature
* Change test used in documentation to use public test methods
* Remove the rest of the unneccessary usages of the startFlow test utility
* Remove extra whitespace
* Rename startFlowAndReturnFuture back to startFlow
* Update api
* The annotation doesn't appear unless its marked as on the actual getter and setter
* Updated docs and removed pointless attribute
* Deleted whitespace
2018-02-07 11:55:06 +00:00
Maksymilian Pawlak
a9856b9ce6
Docker system (end-to-end) test ( #2437 )
...
* System test for IRS Demo utilizing docker, docker-compose and PhantomJS to automate full-stack testing
2018-02-05 11:42:20 +00:00
Patrick Kuo
1c77736d50
merge os to enterprise
2018-01-30 14:00:22 +00:00
Andras Slemmer
fca3d565ac
Add 'Regulator' node for AutoOfferFlow, fixing IRS
2018-01-26 14:29:35 +00:00
Andras Slemmer
69bfc9b437
Comment out lines breaking IRS demo
2018-01-25 19:59:24 +00:00
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
Michele Sollecito
9783f11ba8
Exposed RPC SSL settings through Cordformation ( #2419 )
2018-01-25 14:32:58 +00: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
Tudor Malene
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
Ross Nicoll
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
Andrzej Cichocki
8114a20abd
CORDA-716 Move non-API things to internal ( #2256 )
2017-12-17 18:44:35 +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
05bc05a936
CORDA-716 Retire withTestSerialization ( #2240 )
2017-12-14 12:42:18 +00:00
Shams Asari
2319bf396c
Renamed TestIdentity.key to keyPair and pubkey to publicKey ( #2249 )
2017-12-14 11:30:55 +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
Maksymilian Pawlak
537e304536
IRS demo permissions fix ( #2231 )
2017-12-12 13:56:12 +00:00
Shams Asari
6d6393d984
Merge branch 'feature-network-parameters' into shams-merge-feature-network-parameters
2017-12-11 21:10:34 +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
Shams Asari
65ff931f53
Merge branch 'master' into shams-master-merge-081217
...
# Conflicts:
# node-api/src/main/kotlin/net/corda/nodeapi/internal/crypto/KeyStoreWrapper.kt
# node/src/main/kotlin/net/corda/node/internal/AbstractNode.kt
# node/src/main/kotlin/net/corda/node/services/config/ConfigUtilities.kt
# node/src/test/kotlin/net/corda/node/services/identity/InMemoryIdentityServiceTests.kt
# node/src/test/kotlin/net/corda/node/services/identity/PersistentIdentityServiceTests.kt
# samples/irs-demo/src/integration-test/kotlin/net/corda/test/spring/SpringDriver.kt
# testing/node-driver/src/integration-test/kotlin/net/corda/testing/driver/DriverTests.kt
# testing/node-driver/src/main/kotlin/net/corda/testing/driver/Driver.kt
# testing/node-driver/src/main/kotlin/net/corda/testing/driver/DriverDSL.kt
# testing/node-driver/src/main/kotlin/net/corda/testing/internal/DriverDSLImpl.kt
# testing/node-driver/src/main/kotlin/net/corda/testing/internal/NodeBasedTest.kt
# testing/node-driver/src/main/kotlin/net/corda/testing/internal/RPCDriver.kt
# testing/node-driver/src/main/kotlin/net/corda/testing/internal/demorun/DemoRunner.kt
# testing/test-utils/src/main/kotlin/net/corda/testing/CoreTestUtils.kt
# verifier/src/integration-test/kotlin/net/corda/verifier/VerifierDriver.kt
2017-12-08 16:03:16 +00:00
Andrzej Cichocki
32ea59d085
Inline some DUMMY constants. ( #2200 )
2017-12-08 10:45:22 +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
Shams Asari
6a1aa59e3e
Merge branch 'master' into shams-merge-master-041217
...
# Conflicts:
# node/src/integration-test/kotlin/net/corda/node/services/DistributedServiceTests.kt
# samples/bank-of-corda-demo/src/main/kotlin/net/corda/bank/BankOfCordaCordform.kt
# testing/node-driver/src/main/kotlin/net/corda/testing/NodeTestUtils.kt
# testing/node-driver/src/main/kotlin/net/corda/testing/driver/Driver.kt
# testing/node-driver/src/main/kotlin/net/corda/testing/internal/NodeBasedTest.kt
# testing/node-driver/src/main/kotlin/net/corda/testing/node/MockNode.kt
# testing/node-driver/src/main/kotlin/net/corda/testing/node/NotarySpec.kt
# verifier/src/integration-test/kotlin/net/corda/verifier/VerifierDriver.kt
2017-12-04 13:39:32 +00:00
Andrzej Cichocki
a314a6a125
CORDA-654 Simplify TransactionDSL API ( #2152 )
2017-11-30 16:28:44 +00:00
Shams Asari
fdc31091a6
Merge branch 'feature-network-parameters' into shams-master-merge-291117
...
# Conflicts:
# constants.properties
# gradle-plugins/cordformation/src/main/kotlin/net/corda/plugins/Cordform.kt
# gradle-plugins/cordformation/src/main/kotlin/net/corda/plugins/Node.kt
2017-11-30 12:05:42 +00:00
Katarzyna Streich
c9f3e98795
Another approach to fixing deployNodes task and network parameters generation ( #2066 )
...
* Generate networkParameteres for Cordformation.
Fix deployNodes task in Cordformation to generate NetworkParameters before running the nodes.
Add TestNetworkParametersGenerator utility loaded after node infos generation step.
* Get rid of bouncy castle provider dependency
For cordform-common. It caused problems with loading our custom
X509EdDSAEngine for generation of network parameters in deployNodes
task.
2017-11-30 10:39:29 +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
4bd6fef0f9
StateMachineManager is no longer lateinit. ( #2123 )
2017-11-27 17:55:08 +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
Michele Sollecito
37b4d0e939
Fixed some permission issues with demos. ( #2099 )
2017-11-21 11:20:17 +00:00
Ross Nicoll
19aba62fc6
Move tests to using named identities ( #1879 )
...
Move tests to using named identities in preparation for multiple identities work. Includes:
* NetworkMapCacheTest
* NodeInterestRatesTest
* NodeVaultServiceTest
* ContractUpgradeFlowTest
* Cash tests
* AttachmentSerializationTest
* CordaRPCOpsImplTest
* VaultWithCashTest
* ScheduledFlowTests
2017-11-17 14:16:17 +00:00
Ross Nicoll
e4f5e16bf4
Clean up identities in tests, stage 1 ( #2059 )
...
* Clean up identities in CashTests so that the mini/mega corp keys and identities are correctly
paired together throughout. Previously `miniCorpServices` presented the same key as the
MegaCorp identity, but with the name Mini Corp attached.
* Correct key/name matches in VaultWithCashTest
* Split services in CashTests to not have multiple identities per service hub
2017-11-16 17:17:45 +00:00
Shams Asari
2fe41715cc
On exit, the driver will automaticallly shutdown any nodes which weren't waited for.
...
The motivation for this came with the recent change that a default notary is started by the driver, which if ignored will leak the notary process.
Also, waitForAllNodesToFinish() has been replaced by a driver parameter.
2017-11-14 20:20:00 +00:00
Andrzej Cichocki
6a569fb3f1
Retire findTokenizableService. ( #2036 )
2017-11-10 16:40:18 +00:00
