ac1d3d1fc7
Merge branch 'merge-point-e8b6f5f' into os-merge-e8b6f5f
...
# Conflicts:
# docs/source/api-persistence.rst
# docs/source/example-code/src/main/java/net/corda/docs/java/FlowCookbook.java
# docs/source/upgrade-notes.rst
# node/src/integration-test/kotlin/net/corda/node/modes/draining/FlowsDrainingModeContentionTest.kt
2018-11-15 13:09:06 +00:00
e8b6f5f2f2
CORDA-2005: FinalityFlow has been made into an inlined flow to resolve issue with FinalityHandler ( #4050 )
...
FinalityHandler is insecure in that it is open to receive any transaction from any party.
Any CorDapp targeting platform version 4 or above is required use the new c'tors which take in FlowSession objects to the counterpart flow. This flow must subcall ReceiveFinalityFlow to receive and record the finalised transaction.
Old CorDapps (with target platform version < 4) will continue to work as previously. However if there are no old CorDapps loaded then the node will disable FinalityHandler.
2018-11-14 14:16:22 +00:00
356941a733
Merge commit '015a36dad67998236eda7e45309e66e5d58b6374'
2018-11-06 16:29:24 +00:00
80591bc6fd
StatePointer ( #4074 )
...
* Introducing linear pointer.
* Added design document.
Added StatePointer interface.
Updated design document.
Updated StatePointer implementation.
Added doc section for state pointer.
* Updated design document.
Added API for StatePointer.
* Update core/src/main/kotlin/net/corda/core/contracts/Structures.kt
Co-Authored-By: roger3cev <roger.willis@r3cev.com >
* Update core/src/main/kotlin/net/corda/core/contracts/Structures.kt
Co-Authored-By: roger3cev <roger.willis@r3cev.com >
* Update core/src/main/kotlin/net/corda/core/contracts/Structures.kt
Co-Authored-By: roger3cev <roger.willis@r3cev.com >
* Update docs/source/design/linear-pointer/design.md
Co-Authored-By: roger3cev <roger.willis@r3cev.com >
* Update docs/source/design/linear-pointer/design.md
Co-Authored-By: roger3cev <roger.willis@r3cev.com >
* Resolve pointers
Added test to check pointers are resolved.
Updated docs and kdocs.
Reverted changes to api-current.txt
Revert "Reverted changes to api-current.txt"
This reverts commit dc1cece91a595a4e772f63917b830c7e1fd0586d.
Fix CI bug.
Made StatePointers type safe.
Resolving StatePointers is now optionally recursive
Addressed review comments.
Fixed compile error.
Addressed review comments.
Fixed bug in state pointer search.
Improved efficiency of state pointer search.
Removed whitespace.
TxBuilder logs warning when no service hub is supplied for resolving pointers as opposed to throwing an exception.
* Addressed review comments.
2018-11-05 10:33:26 +00:00
08f32a9329
Merge remote-tracking branch 'open/master' into anthony-os-merge-2018-10-24
...
# Conflicts:
# build.gradle
# core/src/main/kotlin/net/corda/core/internal/JarSignatureCollector.kt
# core/src/main/kotlin/net/corda/core/transactions/TransactionBuilder.kt
# docs/source/cli-ux-guidelines.rst
# docs/source/testnet-explorer-corda.rst
# finance/src/integration-test/kotlin/net/corda/finance/flows/test/CashConfigDataFlowTest.kt
# finance/src/main/kotlin/net/corda/finance/flows/CashConfigDataFlow.kt
# node/src/integration-test/kotlin/net/corda/node/services/statemachine/FlowVersioningTest.kt
# node/src/main/kotlin/net/corda/node/Corda.kt
# node/src/main/kotlin/net/corda/node/internal/Node.kt
# node/src/main/kotlin/net/corda/node/internal/NodeStartup.kt
# node/src/main/kotlin/net/corda/node/services/config/NodeConfiguration.kt
# node/src/test/kotlin/net/corda/node/internal/NodeTest.kt
# testing/node-driver/src/main/kotlin/net/corda/testing/node/internal/DriverDSLImpl.kt
# testing/node-driver/src/main/kotlin/net/corda/testing/node/internal/NodeBasedTest.kt
# tools/explorer/src/main/kotlin/net/corda/explorer/ExplorerSimulation.kt
2018-10-25 11:30:52 +01:00
0919b01271
ENT-2509 - Make @InitiatedBy flows overridable via node config ( #3960 )
...
* first attempt at a flowManager
fix test breakages
add testing around registering subclasses
make flowManager a param of MockNode
extract interface
rename methods
more work around overriding flows
more test fixes
add sample project showing how to use flowOverrides
rebase
* make smallest possible changes to AttachmentSerializationTest and ReceiveAllFlowTests
* add some comments about how flow manager weights flows
* address review comments
add documentation
* address more review comments
2018-10-23 16:45:07 +01:00
430c4bcf83
Merge commit '47068e6b7ad0afb3ed8df61a429470f19331b7b5' into chrisr3-os-merf
...
Conflicts:
docs/source/index.rst
finance/build.gradle
finance/src/integration-test/kotlin/net/corda/finance/flows/test/CashConfigDataFlowTest.kt
node/src/test/java/net/corda/node/services/vault/VaultQueryJavaTests.java
samples/simm-valuation-demo/build.gradle
2018-10-16 12:07:55 +01:00
47068e6b7a
[CORDA-2077] Use latest gradle plugin version (4.0.32), set target version in core and sample CorDapps ( #4038 )
...
* Upgrade gradle plugin; add target version attribute to finance and sample cordapps.
* Remove '-SNAPSHOT' from gradlePluginsVersion.
* Fix naming.
* Update docs.
* Respond to feedback.
* Fix irs demo
* Fix more samples
* Fix more samples
* Fix deployNodes
* Fix deployNodes
* more fixes
* fix simm valuation
* more fixes
* more fixes
* more fixes
* more fixes
* Publication should have *nothing* to do with cordformation and deployNodes.
Remove it! And if this exposes a bug then "so be it".
* Disable CorDapp signing for Cordapp Configuration and Network Verifier.
* Disable CorDapp signing for SIMM Valuation Demo.
* Remove remaining publishing nonsense from samples.
* Workarounds fpr cordapp-configuration, network-verifier and simm-valuation-demo:
JarSigner rejects jars with duplicates inside, so remove them.
* Upgrade to Gradle plugin 4.0.32 and reenable CorDapp signing for samples.
2018-10-15 21:11:52 +01:00
ca5d88e65a
Minor changes made in ENT which should have been ported over ( #3932 )
2018-09-12 11:26:37 +01:00
11e2bef240
ENT-2473: Removed copyright headers ( #1364 )
2018-09-03 16:38:52 +01:00
a63c9526ca
Merge OS
2018-08-01 14:13:39 +01:00
c23167f08e
ENT-2188 fix H2 insecure default configuration ( #3692 )
...
Set the "h2.allowedClasses" system property, require database password when exposing H2 server on non-localhost address, samples start H2 server by default (reintroduces the behaviour before h2Settings.address configuration option was added)
2018-08-01 11:50:42 +01:00
159a3d25a5
Merge remote-tracking branch 'open/master' into tudor-os-merge-31-07
...
# Conflicts:
# finance/src/test/kotlin/net/corda/finance/contracts/CommercialPaperTests.kt
# finance/src/test/kotlin/net/corda/finance/contracts/asset/CashTests.kt
# finance/src/test/kotlin/net/corda/finance/flows/CashIssueFlowTests.kt
# node/src/test/kotlin/net/corda/node/services/persistence/HibernateConfigurationTest.kt
# node/src/test/kotlin/net/corda/node/services/schema/PersistentStateServiceTests.kt
# node/src/test/kotlin/net/corda/node/services/vault/VaultWithCashTest.kt
2018-07-31 17:53:43 +01:00
85caa9ee9d
Feature/corda 1847/remove hibernate observers ( #3696 )
...
* CORDA-1847 Fix hibernate observer issue
* CORDA-1847 Fix hibernate observer issue
* CORDA-1847 Fix hibernate observer issue
* CORDA-1847 Fix tests
* CORDA-1847 Fix tests
* CORDA-1847 Fix tests
2018-07-31 13:52:13 +01:00
61a8bd0a5a
Merge remote-tracking branch 'open/master' into feature/vkolomeyko/os-merge
...
# Conflicts:
# samples/attachment-demo/src/integration-test/kotlin/net/corda/attachmentdemo/AttachmentDemoTest.kt
2018-07-09 16:45:20 +01:00
d481c55b82
CORDA-1743: Remove isDebug = true from Node driver to speed-up integration tests execution. ( #3535 )
...
* CORDA-1743: Remove `isDebug = true` from Node driver to speed-up integration tests execution.
* CORDA-1743: Undo removal of "isDebug = true" from the test that specifically checks for this condition.
* CORDA-1743: Address input from @shamsasari
2018-07-09 16:37:01 +01:00
3203bdae97
Merge from O/S
2018-07-05 19:09:25 +01:00
f7dd4f7880
Use in-memory H2 for integration test ( #2508 )
...
* Default integration tests running with in-memory H2
2018-07-05 14:58:51 +01:00
9b5a099302
ENT-2105: Remove unnecessary sourceSets from integration tests. ( #1029 )
...
The database scripts are already available from the test-utils JAR via the classpath and so don't need
to be included as additional source sets.
2018-06-20 15:38:48 +01:00
9793662719
Merge remote-tracking branch 'open/master' into aslemmer-os-merge-11-jun
2018-06-11 15:57:29 +01:00
768d9309dc
Various tests and fixes related to CORDA-1191
2018-06-07 16:51:04 +01:00
9a69a36904
Merge remote-tracking branch 'remotes/open/master' into merges/may-14-15-21
...
# Conflicts:
# .idea/compiler.xml
# constants.properties
# experimental/behave/src/main/kotlin/net/corda/behave/network/Network.kt
# experimental/behave/src/main/kotlin/net/corda/behave/node/Distribution.kt
# experimental/behave/src/test/kotlin/net/corda/behave/service/PostreSQLServiceTests.kt
# node-api/src/main/kotlin/net/corda/nodeapi/internal/bridging/AMQPBridgeManager.kt
# node-api/src/main/kotlin/net/corda/nodeapi/internal/persistence/CordaPersistence.kt
# node-api/src/main/kotlin/net/corda/nodeapi/internal/persistence/HibernateConfiguration.kt
# node-api/src/main/kotlin/net/corda/nodeapi/internal/protonwrapper/netty/AMQPChannelHandler.kt
# node-api/src/main/kotlin/net/corda/nodeapi/internal/protonwrapper/netty/AMQPClient.kt
# node/src/integration-test/kotlin/net/corda/node/AuthDBTests.kt
# node/src/main/kotlin/net/corda/node/internal/AbstractNode.kt
# node/src/main/kotlin/net/corda/node/internal/NodeStartup.kt
# node/src/main/kotlin/net/corda/node/services/config/ConfigUtilities.kt
# node/src/main/kotlin/net/corda/node/services/messaging/MessagingExecutor.kt
# node/src/main/kotlin/net/corda/node/services/persistence/AbstractPartyToX500NameAsStringConverter.kt
# node/src/main/kotlin/net/corda/node/services/persistence/DBTransactionMappingStorage.kt
# node/src/main/kotlin/net/corda/node/utilities/AddOrRemove.kt
# node/src/test/kotlin/net/corda/node/services/config/NodeConfigurationImplTest.kt
# samples/attachment-demo/src/integration-test/kotlin/net/corda/attachmentdemo/AttachmentDemoTest.kt
# samples/irs-demo/web/src/test/kotlin/net/corda/irs/web/IrsDemoWebApplicationTests.kt
# samples/simm-valuation-demo/src/integration-test/kotlin/net/corda/vega/SimmValuationTest.kt
# testing/node-driver/src/main/kotlin/net/corda/testing/driver/Driver.kt
# testing/node-driver/src/main/kotlin/net/corda/testing/node/internal/InternalTestUtils.kt
# testing/node-driver/src/main/kotlin/net/corda/testing/node/internal/RPCDriver.kt
# testing/smoke-test-utils/src/main/kotlin/net/corda/smoketesting/NodeConfig.kt
# webserver/src/integration-test/kotlin/net/corda/webserver/WebserverDriverTests.kt
2018-05-14 15:56:43 +01:00
d027b5b8f2
[CORDA-1472]: Crackdown on warnings. ( #3136 )
2018-05-14 21:15:52 +07: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
15c015e0d6
Merge branch 'master' into colljos-merge-230418
2018-04-23 12:12:16 +01:00
247a97f1a5
Remove superfluous registerInitiatedFlow calls from tutorial and example tests ( #2944 )
2018-04-20 16:56:27 +01:00
9b58114146
Merge remote-tracking branch 'open/master' into os-merge-f88542f
...
# Conflicts:
# docs/source/changelog.rst
# finance/src/integration-test/kotlin/net/corda/finance/flows/CashSelectionTest.kt
# node/src/test/kotlin/net/corda/node/services/vault/VaultQueryTests.kt
# testing/node-driver/src/integration-test/kotlin/net/corda/testing/driver/DriverTests.kt
2018-04-11 15:40:25 +01:00
f88542faa2
CORDA-1095: Fixed rare race where the startNode future completes before the default notary is visible ( #2947 )
2018-04-11 15:33:55 +01:00
7dbceaadcb
Merge remote-tracking branch 'open/master'
...
# Conflicts:
# node/src/main/kotlin/net/corda/node/services/events/NodeSchedulerService.kt
# node/src/test/kotlin/net/corda/node/services/events/NodeSchedulerServiceTest.kt
2018-03-26 15:46:26 +01:00
36d403dd7d
[CORDA-1262]: Added integration test for Cash Selection. ( #2874 )
2018-03-26 14:07:17 +01:00
c4dc8accde
Merge remote-tracking branch 'remotes/opensource/master' into merges/1
2018-03-16 17:52:01 +00:00
fb37a5bcf1
CORDA-792 Fix local shell in trader demo and SIMM valuation demo. ( #2837 )
...
Added rpcSettings to start RPC so the local shell can connect to the node.
2018-03-16 16:41:34 +00:00
da1afd9c55
Introduced copyright in all source files. ( #519 )
2018-03-06 17:29:21 +00:00
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
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
25263c20c7
Merge remote-tracking branch 'open/master' into aslemmer-merge-19-Feb
2018-02-20 15:52:09 +00:00
6b2b7b6a3c
Merge commit 'fa4b5d16ba6249f85b50851c2f52dc697eebdee6' into aslemmer-merge-19-Feb
2018-02-20 13:26:31 +00:00
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
ad1be79900
Reorders params to put non-default args first. Creates simpler default constructors.
2018-02-12 17:02:34 +00:00
7b65b7971a
CORDA-939 - Don't expose StartedNode and AbstractNode as part of public test api ( #2472 )
...
* Don't expose StartedNode via Node Driver
* Dont expose StartedNode/Abstract Node via MockNetwork
* Remove internal var from constructor as it doesn't hide from public api and change to internal initialisation method
* Update api
* Rename MockNode to StartedMockNode to avoid confusion
Update documentation
Update api-current.txt
* Fix typo
* Fix test failure
* Modify flow tests to use internal mock network and remove additional internal exposures from StartedMockNode
* Fix api-current
* Change InProcess and OutOfProcess to interfaces
* Explicitly declare MockNetwork parameters
Dont expose StateMachineManager
Move affected tests to use internal mock network
* Fix api-current
* Changes requested via review
* Fix IRS Demo address
* Fix api
* Remove internal attribute from classes in internal package
* Remove accidentally added code
* Move useHttps into NodeHandleInternal
* Remove duplicated code
* Update api-current
* Make webAddress internal on NodeHandle
* Make sure parameters in public api are explicitly specified
* Use correct address in IRS Demo
* Get webaddress from webserver handle
* Update api-current
2018-02-12 10:09:59 +00:00
336aeb96e5
Merge fixes
2018-01-26 13:45:03 +00:00
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
9783f11ba8
Exposed RPC SSL settings through Cordformation ( #2419 )
2018-01-25 14:32:58 +00:00
142f52fa82
[CORDA:936]: Enable RPC layer to work with SSL
2018-01-23 16:23:37 +00:00
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
eb3798da5e
Merge remote-tracking branch 'open/master' into colljos-merge-160118
2018-01-16 12:13:49 +00:00
1367cd4adb
CORDA-912 Stop exposing internal node user, create user in testing infrastructu… ( #2361 )
...
* Stop exposing internal node user, create user in testing infrastructure instead
* Update kdocs
2018-01-15 19:30:33 +00:00
1e9e1a61d9
Moved IntegrationTest class into internal package
2018-01-04 22:08:16 +00:00
52173219c3
Merge remote-tracking branch 'open/master' into shams-os-merge-020118
...
# Conflicts:
# client/rpc/src/integration-test/java/net/corda/client/rpc/CordaRPCJavaClientTest.java
# node/src/integration-test/kotlin/net/corda/node/NodeKeystoreCheckTest.kt
# node/src/integration-test/kotlin/net/corda/node/services/network/NetworkMapTest.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/main/kotlin/net/corda/node/services/config/ConfigUtilities.kt
# node/src/test/kotlin/net/corda/node/services/events/NodeSchedulerServiceTest.kt
# testing/node-driver/src/main/kotlin/net/corda/testing/node/internal/DriverDSLImpl.kt
2018-01-02 15:32:32 +00:00
