12856 Commits

Author SHA1 Message Date
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
Austin Moothart
624e1cbfe4
using TLS 1.2 2018-07-20 16:09:57 -04:00
Nick Arini
0c0d9b7906
Azure template guide (#1282)
* Azure template guide and testnet docs update
2018-07-20 16:29:10 +01:00
cxyzhang0
d2446be69e MSSQL support (#3382)
* MSSQL support

* changes per reviewer's comments; doc

* clean up

* CONTRIBUTORS.md

* minor change in comment

* another minor change in comment

* minor formatting

* Comments formatting per recommend style; contributors in alphabet order

* more comment formatting per coding style

* Change MSSQL to SQLServer in codes and comments

* Change MSSQL to SQLServer in doc

* Use generateSequence to build repeats of ?,?,...?
2018-07-20 16:25:15 +01:00
Nick Arini
e5d82cc9b4
Na testnet explorer docs (#3660)
* added doc on testing deployment with node explorer
2018-07-20 16:21:24 +01:00
Dominic Fox
b44fc94997
Merge pull request #1288 from corda/shams-fix-broken-test
Revert "Remove non-compiling tests"
2018-07-20 15:48:48 +01:00
Shams Asari
365c1e6ad2 Revert "Remove non-compiling tests"
This reverts commit 935c4d2. To make the test compile two internal fields in node where made public. It seems that the "internal" modifier does not see integration tests as part of the same module.
2018-07-20 14:34:09 +01:00
Michele Sollecito
fae30c8703
Merge pull request #1285 from corda/2018-07-19
OS merge 2018-07-19
2018-07-20 14:12:57 +01:00
szymonsztuka
6e91fcbb32
Enable new test to run in remote database mode - add SQL setup, add finance packages to create tables by Liquidate. (#1284) 2018-07-20 14:09:58 +01:00
Jonathan Sphar
cad684fbd3 Add Ubuntu environment setup instructions to docs/getting-set-up (#3608)
* remove network simulator references in docs

* Added environment setup instructions for Ubuntu

* Revert "Upstream merge"

This reverts commit db4920fa6801fe9903e45f54feea8b81772fdf25, reversing
changes made to 208ac49da0caaf0dfc5ade9f8bd8a49d13f17aae.

* Address review comments
2018-07-20 11:55:32 +01:00
Dominic Fox
7217a27b28 Allocate ports in a non-deprecated way 2018-07-20 11:38:33 +01:00
Dominic Fox
935c4d2863 Remove non-compiling tests 2018-07-20 11:04:02 +01:00
Dominic Fox
62c2e1c892 OS merge 2018-07-19 2018-07-19 16:43:46 +01:00
Chris Rankin
fe9b89369f
CORDA-1816: Migrate JarFilter plugin to corda-gradle-plugins. (#3651) 2018-07-19 16:35:36 +01:00
Florian Friemel
7466463b89
[CORDA-1572] Create marker file to track initial registration status. (#3621)
[CORDA-1572] Create marker file to track initial registration status.
2018-07-19 16:20:04 +01:00
Konstantinos Chalkias
a94dbc9c9a
Change SZ to CZ in the cert hierarchy diagram (#3655) 2018-07-19 16:07:50 +01:00
Dominic Fox
7a18dbb8ed
Merge pull request #3644 from corda/flow-test-rationalisation
Flow test rationalisation
2018-07-19 15:33:43 +01:00
Dominic Fox
d1455b7a0e Move hamkrest version number into top-level configuration 2018-07-19 14:21:07 +01:00
Dominic Fox
f3d9750ea5 Eliminate needless equalTo 2018-07-19 13:47:18 +01:00
Dominic Fox
c0966067cc Move andRunNetwork out of transaction block 2018-07-19 12:02:46 +01:00
Dominic Fox
974db3a15b Rename matcher 2018-07-19 12:00:02 +01:00
Dominic Fox
2992866269 Eliminate unnecessary transactions 2018-07-19 11:45:42 +01:00
Dominic Fox
fc5cc89fdb Renaming matchers 2018-07-19 11:36:07 +01:00
Nick Arini
82d7ec0729
Na testnet screenshots (#3647)
* update docs/screenshots
2018-07-18 16:38:30 +01:00
Chris Rankin
099756c4c7
Replace internal JDK reference with ASM reference. (#1281) 2018-07-18 16:32:16 +01:00
bpaunescu
53b398a460
ENT-2116: handle amqp client remote error, added test (#3636)
* ENT-2116: handle amqp client remote error, added test

* ENT: 2116 rename test, added logging

* ENT-2116: rename test to indicate its purpose
2018-07-18 16:07:42 +01:00
Chris Rankin
1b05ccd397
Merge pull request #1280 from corda/chrisr3-os-merge
Merge up to e879de70f306af30a80ecbd125dab799aeeaf268.
2018-07-18 15:35:54 +01:00
Dominic Fox
0780d6051e Use startFlowAndRunNetwork 2018-07-18 15:21:04 +01:00
Dominic Fox
201628e44f Extract common test functionality into mixin interfaces 2018-07-18 13:49:49 +01:00
Viktor Kolomeyko
8c103d4247
ENT-2261: Systematic integration test for FlowProcessing (#1278)
* ENT-2261: Skeleton of parameterized test.

* ENT-2261: Programmatically compose rules and install them.

* ENT-2261: Separate counter decrement from termination.

* ENT-2261: Extend coverage to "executePersistCheckpoint".

* ENT-2261: Extend coverage to "ClientMessageImpl.acknowledge()"

* ENT-2261: Extend coverage to "RPCServer.context()"

* ENT-2261: Extend coverage to "ActionExecutorImpl.executeReleaseSoftLocks()" (unfinished)

* ENT-2261: Re-structure test data slightly.
"executeReleaseSoftLocks" seems to be failing.

* ENT-2261: Correct expectations in terms of number of transactions that ought to be produced.

Also use "eventually" construct to cater for node restart which may take some time.

* ENT-2261: Incorporate feedback from @exFalso and use polling approach.

* ENT-2261: Additional debug output.

* ENT-2261: Further expand coverage to RPCServer.context()

Also tighten-up assertion checks.

* ENT-2261: Further expand coverage to ActionExecutorImpl.executeCreateTransaction()

* ENT-2261: Further expand coverage to ActionExecutorImpl.executeRemoveCheckpoint()

* ENT-2261: Further expand coverage to ActionExecutorImpl.executePersistDeduplicationIds() and ActionExecutorImpl.executeCommitTransaction()

* ENT-2261: Revert non-material change.
2018-07-18 13:18:01 +01:00
Chris Rankin
0ceb9c3f22 Remove merge junk from constants.properties. 2018-07-18 11:36:24 +01:00
Joel Dudley
08b5cb6d5f
Remove old future to event horizon not being implemented. (#3642) 2018-07-18 11:05:30 +01:00
Shams Asari
ff607e1bc1
Moved network services tests back as unit tests (#3639) 2018-07-18 11:03:45 +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
fbac6d7042 Remove RandomFree reference to fix merge. 2018-07-18 10:24:57 +01:00
Chris Rankin
d54bf2f761 Remove Guava shading from node-api because Curator already shades its own. 2018-07-18 09:29:56 +01:00
Chris Rankin
aa50aaf95d Merge commit 'e879de7' into chrisr3-os-merge 2018-07-17 22:47:24 +01:00
Viktor Kolomeyko
7e3687c306
CORDA-1820: Reduce amount of logging/lookup performed by SerializerFactory.findCustomSerializer() (#3633)
* CORDA-1820: Reduce amount of logging/lookup performed by SerializerFactory.findCustomSerializer()

* CORDA-1820: Changes to make DJVM work.
2018-07-17 21:04:04 +01:00
James Brown
dafd979bde CORDA-1818 - fix markup in h2 docs (#3629) 2018-07-17 17:47:46 +01:00
Dominic Fox
45514a8764 Minor tidying 2018-07-17 17:19:58 +01:00
Dominic Fox
e16056eb36 Refactor to new style, sharing mock network 2018-07-17 17:12:20 +01:00
Dominic Fox
73d3af504d
Merge pull request #3615 from corda/df-reuse-mock-network-example
Reuse mock network, randomising party names to avoid clash
2018-07-17 17:10:33 +01:00
Konstantinos Chalkias
8a54badc6a
CORDA-1514 Add our patented nested Merkle trees protocol to documentation 2018-07-17 15:36:10 +01:00
josecoll
0e75027525 Configure remote gradle build cache. 2018-07-17 15:09:15 +01:00
Shams Asari
921b132658
Deprecated freeLocalHostAndPort, freePort and getFreeLocalPorts of TestUtils (#3630)
They're prone to cause flaky tests due to the "allocated" ports already being taken by the system when eventually needed. Replaced usages with PortAllocation.Incremental.

Affected unit tests made into integration tests to avoid any issues in the future when unit tests are made to run in parallel.
2018-07-17 14:42:30 +01:00
szymonsztuka
2003881b77
Features/fix integration test in database mode (#1276)
Fix new/altered integration tests to run in database mode, disable new H2 db specific test when running against a remote database.
2018-07-17 12:40:05 +01:00
bpaunescu
cb4e428ec4
Merge pull request #1275 from corda/bogdan-merge-160618
OS-ENT merge
2018-07-17 12:37:45 +01:00
Chris Rankin
e879de70f3
CORDA-1800: Shrink the Simm Valuation Demo's contract states using ProGuard. (#3586)
* Shrink the Simm Valuation Demo's contract states CorDapp using ProGuard.
* Remove CordFormation from CorDapp modules, which unbundles Jolokia from the CorDapps.
* Preserve directory structure for CorDapp's own classes.
* Remove unwanted transitive dependencies from Simm Valuation CorDapps.
* Use allprojects {} to set Strata version property.
2018-07-17 12:31:44 +01:00
Stefano Franz
829be5dfb6
CORDA-1747 fix issue around RPC return of generic objects (#3625)
* fix issue around RPC return of generic objects

* address review comments
2018-07-17 12:19:06 +01:00