Christian Sailer
8027a11420
ENT-1993 Simplified notary healthcheck tool ( #1286 )
...
* Moved notary healthcheck
* Rename directories and fix up build
* Moved notary healthcheck to tools
* Fix up gradle files and move long running tests to integration-test
* Add copyright headers
* Remove obsolete resource
* Break up large `call()` function, move helpers to be private in companion object
* Move ScheduledCheckFlow to its own file
* Docs etc.
* Code review: Replace magic literals by constants, enums, etc.
* Delete Readme.md (the content will be available in documentation)
* Slight refactoring of the handling flows.
* Publishing
* Fix test
* Add missing artifactory dependency
* Small documentation fixes
* Typo
2018-07-24 14:41:31 +01:00
Anthony Keenan
4708c62de4
Merge remote-tracking branch 'open/master' into os-merge-20180724
...
# Conflicts:
# CONTRIBUTORS.md
# docs/source/contributing.rst
# docs/source/corda-configuration-file.rst
# docs/source/index.rst
# node/src/integration-test/kotlin/net/corda/node/services/messaging/ArtemisMessagingTest.kt
# node/src/main/kotlin/net/corda/node/internal/AbstractNode.kt
# settings.gradle
2018-07-24 11:33:21 +01:00
Michele Sollecito
a4d65dae22
Merge remote-tracking branch 'remotes/open/master' into merges/july-23-11-26
...
# Conflicts:
# confidential-identities/src/test/kotlin/net/corda/confidential/IdentitySyncFlowTests.kt
# docs/source/changelog.rst
# node/src/integration-test/kotlin/net/corda/node/NodePerformanceTests.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/BFTSMaRtTests.kt
# node/src/main/kotlin/net/corda/node/internal/Node.kt
# node/src/main/kotlin/net/corda/node/internal/cordapp/JarScanningCordappLoader.kt
# node/src/main/kotlin/net/corda/node/internal/cordapp/ManifestUtils.kt
# node/src/test/kotlin/net/corda/node/CordaRPCOpsImplTest.kt
# node/src/test/kotlin/net/corda/node/internal/cordapp/JarScanningCordappLoaderTest.kt
# node/src/test/kotlin/net/corda/node/messaging/TwoPartyTradeFlowTests.kt
# node/src/test/kotlin/net/corda/node/services/TimedFlowTests.kt
# settings.gradle
# testing/node-driver/src/main/kotlin/net/corda/testing/node/MockServices.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
2018-07-23 15:22:39 +01:00
Matthew Layton
6a895401c5
series0ne/corda-demobench-cordapp-select ( #3543 )
...
Adds the ability to multi-select CorDapp JARs for node profiles.
2018-07-23 12:34:07 +01:00
Anthony Keenan
168664f7a8
Merge remote-tracking branch 'open/master' into os-merge-20180722
...
# Conflicts:
# CONTRIBUTORS.md
# constants.properties
# docs/source/aws-vm-explore.rst
# docs/source/azure-vm-explore.rst
# docs/source/corda-networks-index.rst
# docs/source/gcp-vm.rst
# docs/source/getting-set-up.rst
# docs/source/node-database.rst
# finance/src/main/kotlin/net/corda/finance/contracts/asset/cash/selection/CashSelectionSQLServerImpl.kt
# finance/src/main/resources/META-INF/services/net.corda.finance.contracts.asset.cash.selection.AbstractCashSelection
# node/src/main/kotlin/net/corda/node/services/vault/NodeVaultService.kt
# node/src/test/kotlin/net/corda/node/services/config/NodeConfigurationImplTest.kt
2018-07-22 23:06:43 +01:00
Anthony Keenan
7853cfe003
[CORDA-1482] Make boolean config variables case insensitive ( #3622 )
...
* Make boolean config variables case insensitive
* Address review comments
2018-07-21 11:54:02 +01:00
Dominic Fox
62c2e1c892
OS merge 2018-07-19
2018-07-19 16:43:46 +01:00
Michal Kit
c0207b2219
CORDA-1815 adding maxTransactionSize validation ( #3635 )
...
* CORDA-1815 adding maxTransactionSize validation
* Fixing failing tests
* Fixing failing test
2018-07-18 10:34:41 +01:00
Chris Rankin
aa50aaf95d
Merge commit 'e879de7' into chrisr3-os-merge
2018-07-17 22:47:24 +01:00
Shams Asari
736d62ec1a
Retire RandomFree as it causes flaky tests ( #3626 )
2018-07-17 10:29:47 +01:00
dmytrobr
21725ef192
CORDA-3167 added titles to Treasury chart in Explorer
2018-07-17 11:15:30 +02:00
rick.parker
21a7b56161
Fix up compilation errors.
2018-07-13 14:33:13 +01:00
rick.parker
4e81d26985
Merge remote-tracking branch 'remotes/open/master' into parkri-os-merge-20180713-1
2018-07-13 13:15:53 +01:00
Mike Hearn
df84dd5a33
Address review comments.
2018-07-12 18:42:19 +02:00
Mike Hearn
309a5fd9ec
Address review comments.
2018-07-12 18:42:19 +02:00
Mike Hearn
20c03d2196
Blob inspector: add support for hex and base64 inputs.
...
Also rename the file to make it easier to navigate to it in IntelliJ
by keyboard.
2018-07-12 18:42:19 +02:00
Thomas Schroeter
baabf8ceb9
Merge remote-tracking branch 'open-source/master' into thomas/os-merge-2018-07-11
...
Conflicts:
finance/src/integration-test/kotlin/net/corda/finance/flows/CashConfigDataFlowTest.kt
node/src/integration-test/kotlin/net/corda/node/BootTests.kt
node/src/integration-test/kotlin/net/corda/node/NodeUnloadHandlerTests.kt
node/src/integration-test/kotlin/net/corda/node/flows/FlowRetryTest.kt
tools/shell/src/integration-test/kotlin/net/corda/tools/shell/InteractiveShellIntegrationTest.kt
tools/shell/src/integration-test/kotlin/net/corda/tools/shell/SSHServerTest.kt
webserver/src/integration-test/kotlin/net/corda/webserver/WebserverDriverTests.kt
2018-07-11 14:56:03 +01:00
Shams Asari
ac179aa9ab
CORDA-1664: Blob inspector able to display SignedTransaction blobs dumped from a node's db. ( #3559 )
2018-07-11 14:50:51 +01:00
Shams Asari
2833ec2a88
Avoiding starting notaries in driver-based integration tests to speed them up ( #3544 )
2018-07-11 11:36:36 +01:00
Viktor Kolomeyko
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
Viktor Kolomeyko
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
Shams Asari
5d55a87d70
Merge remote-tracking branch 'open/master' into os-merge-aefd90f
...
# Conflicts:
# CONTRIBUTORS.md
2018-07-09 12:33:47 +01:00
Stefano Franz
dcfe37c83c
add ability to specify x500 of node to add. ( #3528 )
2018-07-06 13:19:16 +01:00
Anthony Keenan
3203bdae97
Merge from O/S
2018-07-05 19:09:25 +01:00
Shams Asari
300e0573fe
Merge pull request #1205 from corda/os-merge-244167d
...
O/S merge from 244167d
2018-07-05 17:16:52 +01:00
Tudor Malene
8a6b20107b
ENT-2213 Small fixes for the db management tool ( #1208 )
...
* ENT-2213 Small fixes for the db management tool
* ENT-2213 address code review comments
2018-07-05 16:44:59 +01:00
Shams Asari
0c8c914882
Removing warnings
2018-07-05 15:45:28 +01:00
Maksymilian Pawlak
30d5d45c87
[CORDA-1568] Omit synthetic methods in shell ( #3517 )
2018-07-05 14:59:13 +01:00
Chris Rankin
02978fc174
Resolve warnings for Kotlin ByteArray. ( #3521 )
2018-07-05 13:00:29 +01:00
Shams Asari
20a589d66d
Merge remote-tracking branch 'open/master' into os-merge-244167d
...
# Conflicts:
# docs/source/example-code/src/main/kotlin/net/corda/docs/FlowCookbook.kt
# docs/source/example-code/src/main/kotlin/net/corda/docs/LaunchSpaceshipFlow.kt
# docs/source/example-code/src/main/kotlin/net/corda/docs/tutorial/tearoffs/TutorialTearOffs.kt
# docs/source/running-a-node.rst
# experimental/behave/build.gradle
# experimental/behave/src/scenario/kotlin/net/corda/behave/scenarios/helpers/Substeps.kt
# experimental/kryo-hook/build.gradle
# experimental/quasar-hook/build.gradle
# node/src/integration-test/kotlin/net/corda/node/AuthDBTests.kt
# node/src/main/kotlin/net/corda/node/services/config/NodeConfiguration.kt
# node/src/test/java/net/corda/node/services/vault/VaultQueryJavaTests.java
# node/src/test/kotlin/net/corda/node/internal/NodeTest.kt
# node/src/test/kotlin/net/corda/node/services/messaging/ArtemisMessagingTest.kt
# node/src/test/kotlin/net/corda/node/services/persistence/HibernateConfigurationTest.kt
# samples/attachment-demo/src/integration-test/kotlin/net/corda/attachmentdemo/AttachmentDemoTest.kt
# samples/irs-demo/src/integration-test/kotlin/net/corda/test/spring/SpringDriver.kt
# testing/node-driver/src/main/kotlin/net/corda/testing/node/internal/NodeBasedTest.kt
2018-07-04 18:38:34 +01:00
Shams Asari
244167d3e9
Enabled warnings as errors ( #3514 )
2018-07-04 17:17:27 +01:00
Chris Rankin
d634cdcbac
Clear some cut-and-paste cruft out of our Gradle files. ( #3511 )
2018-07-04 15:42:43 +01:00
Matthew Nesbit
0f98a1cbcd
Merge remote-tracking branch 'remotes/open/master' into mnesbit-merge-20180702
...
# Conflicts:
# node/src/test/kotlin/net/corda/node/services/vault/VaultQueryTests.kt
2018-07-02 11:31:18 +01:00
szymonsztuka
470921afb9
ENT-1741 Build standalone shell JAR distribution - subsequent fix ( #3476 )
2018-06-29 12:03:18 +01:00
szymonsztuka
0a700fd3f0
ENT-1741 Build standalone shell JAR distribution - fix ( #3474 )
2018-06-29 10:32:37 +01:00
sollecitom
ec4ec7e8c6
Merge remote-tracking branch 'remotes/open/master' into merges/june-29-10-20
...
# Conflicts:
# docs/source/upgrade-notes.rst
2018-06-29 10:22:16 +01:00
Chris Rankin
4267513332
CORDA-1693: Ensure that DemoBench's RPC connections terminate on shutdown. ( #3468 )
2018-06-28 16:37:51 +01:00
Shams Asari
07995e0eb0
Merge remote-tracking branch 'open/master' into os-merge-d5b5825
...
# Conflicts:
# CONTRIBUTORS.md
# tools/explorer/src/main/kotlin/net/corda/explorer/Main.kt
2018-06-28 15:10:58 +01:00
Chris Rankin
76c114502e
CORDA-1686: Make Node Explorer release its RPC connection on shutdown. ( #3457 )
...
* Make Node Explorer release its RPC connection on shutdown.
* Declare Explorer's login() function as tail-recursive.
* Replace lateinit rpcConnection with oridinary var.
* Notify the node when closing an RPC connection gracefully.
2018-06-28 13:33:07 +01:00
Stefano Franz
de6e78b4a3
V2 gui for the bootstrapper ( #3373 )
...
* V2 gui
* Misc small fixes and tweaks
* V2 gui
* More tweaks
* fix horizontal resize issue
2018-06-28 12:05:36 +01:00
sollecitom
b09368a17a
Merge remote-tracking branch 'remotes/open/master' into merges/june-28-09-45
...
# Conflicts:
# docs/source/getting-set-up.rst
# docs/source/node-database.rst
2018-06-28 09:51:11 +01:00
Shams Asari
eee2563bfa
CORDA-1660: Wiring up the CordaRPCClient class loader to the p2p serialisation context. ( #3454 )
...
This is to allow the standalone shell to be able to receive WireTransactions containing Cash.State objects.
2018-06-27 17:02:35 +01:00
Viktor Kolomeyko
4cc4e3f01b
Fix DemoBench Windows installer ( #3451 )
...
Specify paths to build tools correctly or else bugfixes will not applied.
2018-06-27 16:45:39 +01:00
Christian Sailer
20c53a5a45
ENT-2133 Explorer demo nodes fix ( #1091 ) ( #1098 )
2018-06-27 16:09:49 +01:00
Chris Rankin
99e314d017
ENT-2145: Configure DemoBench nodes to issue selected currencies. ( #3452 )
2018-06-27 14:01:49 +01:00
Thomas Schroeter
eb698160fa
Merge remote-tracking branch 'open-source/master' into thomas/os-merge-2018-06-27
2018-06-27 13:00:37 +01:00
Chris Rankin
7e05e373d7
CORDA-1687: Remove unwanted hibernate-core from DemoBench and Node Explorer. ( #3449 )
2018-06-27 12:52:36 +01:00
Andrius Dagys
4281061c47
Merge remote-tracking branch 'open/master' into andrius/os-merge-06-27
2018-06-27 10:41:28 +01:00
Chris Rankin
8ecf3b5e49
CORDA-1685: Remove bank-of-corda.jar
from DemoBench. ( #3446 )
2018-06-26 22:53:22 +01:00
Thomas Schroeter
ad2890193d
Specify Notary in CashIssueAndPaymentFlow
and PaymentRequest
( #3443 )
...
* Specify notary in CashIssueAndPaymentFlow
* Specify notary in PaymentRequest
* Address comments
* Default to the first notary in the `CashPaymentFlow`
2018-06-26 16:45:18 +01:00