Commit Graph

10395 Commits

Author SHA1 Message Date
Andras Slemmer
107fcf82e3 Fixing stuff 2017-12-18 15:39:08 +00:00
josecoll
f3f06976d0 Fix failing perftestcordapp tests. 2017-12-18 15:23:16 +00:00
josecoll
9fbd936eeb Merge remote-tracking branch 'origin/colljos-os-merge-rc01' into colljos-os-merge-rc01 2017-12-18 14:31:00 +00:00
josecoll
79f288dcf6 Fix compilation errors on Tests following rebase from OS. 2017-12-18 14:30:46 +00:00
Tudor Malene
066bb767d1 fixing merge errors 2017-12-18 12:40:57 +00:00
josecoll
671e711dda Added missing Mock expectation. 2017-12-18 12:00:03 +00:00
josecoll
fc7445f714 Resolve compilation issues related to Network Map changes. 2017-12-18 11:30:32 +00:00
josecoll
e9fc6f7c8d Merge remote-tracking branch 'open/master' into colljos-os-merge-rc01 2017-12-18 10:24:38 +00:00
Shams Asari
00a5e3db6b CORDA-830 Introducing the network bootstrapper
Copying of the node-info files moved out of Cordform and into NetworkParametersGenerator (which is now called NetworkBootstrapper). This class becomes an external tool to enable deployment of nodes in a test setup on a single filesystem.
2017-12-17 23:49:57 +00:00
Shams Asari
e9cead9055 CORDA-833: SignedNodeInfo object for holding a list of signatures, one for each identity in the NodeInfo. This forms part of the network map. 2017-12-17 19:45:58 +00:00
Andrzej Cichocki
8114a20abd
CORDA-716 Move non-API things to internal (#2256) 2017-12-17 18:44:35 +00:00
Tudor Malene
f2194fcfd4
Integrate db migration tool - liquibase (#150)
[ENT-996]: integrate Liquibase for data migration
2017-12-16 15:58:12 +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
Matthew Nesbit
595d41af04
AMQP Bridging between nodes (#2181)
* Able to send hand coded messages to an Artemis node inbox

Get startup race condition fixed. Start cleanup work.

Fixup after rebase

Remove SASL hack for now

Minor tweaks. Enable AMQP mode manually.

Add configuration control

Slight clean up

Stop timeouts that don't work with AMQP

Rename class

Get TLS constants from :node-api

Primitive integration test

Put back commented line

Session per bridge to alow rollback on remote rejects.

Add more tests and handle multiple IP adddresses

Reduce logging

Fixup after rebase

Add a test to verify the remote end AMQP rejection logic works and does cause message replay.

Allow Artemis to duplicate after session rollback

Reduce number of threads

Move legacy bridge related code over to CoreBridgeManager

Shared threadpool for bridges

Add a test to confirm that no side effects when using a shared thread pool.

Address PR comments and remove dead lines

Rebase and add some comments

Remove a couple of blank lines

Ensure AMQP bridges are used in tests

Fixup after removal of testNodeConfiguration

Add a couple of doc comments

Add a couple of doc comments

Make things internal and use CordaFuture

Address some PR comments

Change comment type

* Use Artemis 2.2 to fix AMQP problems. Add explicit test of legacy core bridges, as marking the factory class private had silently broken them.

* Fix change due to using Artemis 2.2
2017-12-15 17:48:33 +00:00
Rick Parker
af596cfdde
First working notary functional tests for R3Net. (#200) 2017-12-15 17:11:51 +00:00
Katarzyna Streich
02ad2b8b60
Fix LargeTransactionTest (#2265) 2017-12-15 16:53:57 +00:00
Christian Sailer
037673abe4
perftest scripts (#172)
* SQL scripts to set up SQL server for perftest cluster

* Fix notary name in jmx files
2017-12-15 16:15:11 +00:00
Tommy Lillehagen
f469b30c64
ENT-1012 Update version tag for libssl-dev/openssl (#202)
1.0.2g-1ubuntu4.9 no longer exists, so update to 1.0.2g-1ubuntu4.10
2017-12-15 16:12:11 +00:00
Andrzej Cichocki
479a656484
CORDA-716 Consistent MockServices API (#2247)
* Consistent MockServices API.

* Fix compile error.
2017-12-15 13:15:05 +00:00
Tommy Lillehagen
c6bed31f58
ENT-1012 - Add build container and sx utility (#171)
* ENT-1012 - Add build container and sx utility

* ENT-1012 - Add readme file for the sx utility

* ENT-1012 - Check that Docker is installed

* ENT-1256 - Add ProGuard 6 Beta dependency

* ENT-1012 - Phony targets in container build
2017-12-15 13:12:16 +00:00
Katelyn Baker
1dfe25083b
Merge pull request #2263 from corda/brokentest
Corda-862 - Fix notary demo for AMQP
2017-12-15 11:44:02 +00:00
szymonsztuka
5744f3d5b2
Extended timeout for a VaultQuery integration test. (#199)
* A VaultQuery test involving a time window fails against Azure SQL on TC, the timeout value has been increased from 3 to 6 seconds.
* Add missing schema in Azure master db setup.
2017-12-15 11:37:08 +00:00
Katarzyna Streich
550469ea38
Wire part of network parameters (#2187)
* Take maximum message size from network parameters

* Add epoch handling

* Add handling of network parameters mismatch

Change NetworkMapClient and updater, add handle in
AbstractNode that results in node shutdown on parameters mismatch. Later
on we should implement proper handling of parameters updates.
Add tests of NetworkParameters wiring.

When node starts with compatibilityZone url configured it takes
networkParameters from the networkMap.

* Permit only one network parameters file

On node startup network parameters are read from node's base directory,
we permit only zero or one files to be there. If network map server is
configured the parameters can be downloaded at startup (if not present
in the directory already).

* Update docs on network map endpoints
2017-12-15 11:13:15 +00:00
Katelyn Baker
8dfe377ae1 Corda-862 - Fix notary demo for AMQP 2017-12-15 10:13:18 +00:00
Christian Sailer
223737ebb8
Fix perftestcordapp unit tests (#198) 2017-12-15 08:13:28 +00:00
Tommy Lillehagen
90f6cd1fe7
Merge pull request #2252 from corda/tlil/ENT-1249/downgrade-artemis-2.2
ENT-1249 - Downgrade Artemis from v2.4 to v2.1
2017-12-15 07:01:13 +00:00
szymonsztuka
9600622db7
Add db integration test setup for new tests (#197)
* Added db test setup for NetworkMapTest and NodeRegistrationTest.
* Removed database.serverNameTablePrefix property setup for notaries in DriveDSL (after rebase from OS)
* Add missing schemas for Azure master database setup.
2017-12-14 17:33:59 +00:00
Christian Sailer
2f246afc28
Enable JMeter batch runs (#196)
* Fix arg name in jmeter build.gradle

* Run ssh tunnels in daemon threads

* Tweak jmeter properties to ensure batch runs always exit

* Testplan for 40000 test issuances plus README explanation of non GUI run.
2017-12-14 17:01:57 +00:00
Andrzej Cichocki
21e1118ea0
Make test constants Java-visible fields. (#2258) 2017-12-14 16:30:18 +00:00
Tommy Lillehagen
5e60aa1c55 ENT-1249 - Downgrade to version 2.1 instead 2017-12-14 16:01:47 +00:00
igor nitto
409cefd467 CORDA-827: more doc changes (#2254)
* CORDA-827: more doc changes

* CORDA-827: more doc changes
2017-12-14 15:42:34 +00:00
igor nitto
2aac969463 Minor fix to "API: Vault Query" docsite page (#1910)
* Minor fix to "API: Vault Query" docsite page

* Some more typo found in documentation
2017-12-14 14:09:26 +00:00
Joel Dudley
dbf6862f32
Adds debugging info for contract constraints, and links to it from error message. 2017-12-14 14:01:21 +00:00
Katarzyna Streich
158993edb1 Fix broken doorman tests after OS -> ENT merge 2017-12-14 13:24:38 +00:00
Andrzej Cichocki
05bc05a936
CORDA-716 Retire withTestSerialization (#2240) 2017-12-14 12:42:18 +00:00
Tommy Lillehagen
a260d7eb0b
ENT-1189 - Update SGX driver (#163)
* Remove linux-sgx-driver; re-add subtree (currently not playing ball)

* Squashed 'sgx-jvm/linux-sgx-driver/' content from commit 03435d33d

git-subtree-dir: sgx-jvm/linux-sgx-driver
git-subtree-split: 03435d33de0bcca6c5777f23ac161249b9158f1e
2017-12-14 12:36:34 +00:00
Tommy Lillehagen
f21f8e7142
ENT-1187 - Update Intel SGX SDK (#165)
* Remove diverged copy of 'linux-sgx'

* Squashed 'sgx-jvm/linux-sgx/' content from commit 3699ffd5e

git-subtree-dir: sgx-jvm/linux-sgx
git-subtree-split: 3699ffd5ebd8e79d599301fa2e5814e2386cad2d

* ENT-1194 - Executable heap

* ENT-1194 - Placeholder for passing of enclave context to create_thread
2017-12-14 12:33:15 +00:00
Konstantinos Chalkias
5b33db93fc
Add doc comments on supported TLS schemes and scheme hash functions (#2161) 2017-12-14 12:30:07 +00:00
Katarzyna Streich
0df846148d
SignedNetworkMap verification fix (#2255)
* SignedNetworkMap verification fix

SignedNetworkMap verification should also include cert path validation,
which was probably moved away by accident, because docs say about the
exception CertPathValidatorException.
2017-12-14 12:06:44 +00:00
Christian Sailer
205663d37f
SQL coin selection (#186)
* Copy SQL server cash selection and all other required changes from finance to perftestcordapp

* Copy SQL server cash selection and all other required changes from finance to perftestcordapp

* Add cash selection to manifest
2017-12-14 11:56:48 +00:00
Shams Asari
70b6944c96
Merge pull request #2074 from corda/mkit-add-test-comment
Adding comment to test
2017-12-14 11:40:35 +00:00
Shams Asari
2319bf396c Renamed TestIdentity.key to keyPair and pubkey to publicKey (#2249) 2017-12-14 11:30:55 +00:00
josecoll
2512b29b26
Merge pull request #192 from corda/colljos-doorman-remove-OS-dependencies
Doorman: remove final dependencies on OS.
2017-12-14 10:51:23 +00:00
Michal Kit
f3253b4644 Adding comment to test 2017-12-14 10:48:38 +00:00
Tommy Lillehagen
4ad7b2325e ENT-1249 - Downgrade to Artemis 2.2 to protect against rouge connections causing OOM 2017-12-14 09:47:57 +00:00
Shams Asari
d5f8258bd1 Updated the changelog to incorporate the new network map design as one story. 2017-12-13 20:37:54 +00:00
josecoll
c9bcacd4b4 Remove final dependencies on OS. 2017-12-13 18:39:00 +00:00
Shams Asari
e781d816a8 Removed remaining uses of KRYO_P2P_CONTEXT 2017-12-13 18:24:05 +00:00
Maksymilian Pawlak
7cfe7f2a78
Windows space in path escape (#2246) 2017-12-13 18:21:00 +00:00
Joel Dudley
1b49c50c8e
Clarifies that only the first two tutorials are related and form a sequence. 2017-12-13 17:46:31 +00:00