Commit Graph

28 Commits

Author SHA1 Message Date
josecoll
16ef2df1d5 Added missing RigourousMock assertions. 2017-12-11 12:23:14 +00:00
josecoll
d984b4722e Re-enable perftestcordapp and jmeter - fix compilation errors caused by MockServices and DriverDSL refactoring. 2017-12-11 11:42:53 +00:00
szymonsztuka
57c6460ddc Fixes after merge Open Source into Enterprise. 2017-12-06 10:43:09 +00:00
Andras Slemmer
63027a077d State machine rewrite 2017-12-05 11:36:20 +00:00
szymonsztuka
07e46ddb3c Merge OS to Enterprise - fixes after merge: update SQL Server cash query, test in pertestcordapp module, platform version 1 2017-12-01 00:02:11 +00:00
Christian Sailer
456c020575
Merge pull request #141 from corda/christians-jmeter-flows
Sampler and configuration for multi node flow in JMeter
2017-11-30 11:05:37 +00:00
Christian Sailer
aab2ad58d9 Hook up anonymised payment and add test for that + some code reformatting 2017-11-24 14:54:57 +00:00
Christian Sailer
0b7678b8ec Flow to issue cash and pay using the returned tx id rather than a vault
query to find the new state
2017-11-24 14:25:56 +00:00
Christian Sailer
792089e179 Unit test for CashIssueAndPaymentFlow 2017-11-24 14:23:37 +00:00
Christian Sailer
c1c42c98e4 Make jmeter samplers depend on perftestcordapp rather than finance 2017-11-23 12:03:17 +00:00
josecoll
cca532b5c0 Fixed incorrect imports. 2017-11-19 23:15:41 +00:00
josecoll
0a62fd8a7a Fixed incorrect imports. 2017-11-19 23:10:02 +00:00
josecoll
730aed6cf2 Updated and fixed all failing Unit tests from perftestcordapp module (temporarily set to @Ignore). 2017-11-19 19:48:29 +00:00
josecoll
960d9010f6 Fix cash spending tests in perftestcordapp module. 2017-11-19 11:28:23 +00:00
josecoll
b71c1a8744 @Ignore duplicate failing tests (after merge from OS). 2017-11-19 10:59:45 +00:00
josecoll
e579abd274 @Ignore duplicate tests with incorrect setup. 2017-11-19 10:11:13 +00:00
josecoll
c817252e7a Fix compilation errors in perftestcordapp module. 2017-11-17 17:36:00 +00:00
Christian Sailer
8b55f415bd Merge branch 'master' of https://github.com/corda/corda into christians_os_merge_20171106 2017-11-06 17:37:30 +00:00
Christian Sailer
0f2a98af91 Merge remote-tracking branch 'corda/master' into christians_os_merge_20171031 2017-11-02 14:50:49 +00:00
Christian Sailer
fe5b683c1a Fix and re-enable perftest cordapp unit test for two party trade flow (#82) 2017-10-27 08:44:07 +01:00
josecoll
ef7ccd3147 Merge Open Source to Enterprise (#79)
* Check array size before accessing

* Review fixes

* CORDA-540: Make Verifier work in AMQP mode (#1870)

* reference to finance module via not hardcoded group ID (#1515)

*  generic way to reference to group id when loading finance.jar via cordapp

* Fixed the node shell to work with the DataFeed class

* Attempt to make NodeStatePersistenceTests more stable (#1895)

By ensuring that the nodes are properly started and aware of each other before firing any flows through them.
Also minor refactoring.

* Disable unstable test on Windows (#1899)

* CORDA-530 Don't soft-lock non-fungible states (#1794)

* Don't run unlock query if nothing was locked
* Constructors should not have side-effects

* [CORDA-442] let Driver run without network map (#1890)

* [CORDA-442] let Driver run without network map

- Nodes started by driver run without a networkMapNode.

- Driver does not take a networkMapStartStrategy anymore

- a new parameter in the configuration "noNetworkMapServiceMode" allows for a node not to be a networkMapNode nor to connect to one.

- Driver now waits for each node to write its own NodeInfo file to disk and then copies it into each other node.

- When driver starts a node N, it waits for every node to be have N nodes in their network map.

Note: the code to copy around the NodeInfo files was already in DemoBench, the NodeInfoFilesCopier class was just moved from DemoBench into core (I'm very open to core not being the best place, please advise)

* Added missing cordappPackage dependencies. (#1894)

* Eliminate circular dependency of NodeSchedulerService on ServiceHub. (#1891)

* Update customSchemas documentation. (#1902)

* [CORDA-694] Commands visibility for Oracles (without sacrificing privacy) (#1835)

new checkCommandVisibility feature for Oracles

* CORDA-599 PersistentNetworkMapCache no longer circularly depends on SH (#1652)

* CORDA-725 - Change AMQP identifier to officially assigned value

This does change our header format so pre-cached test files need
regenerating

* CORDA-725 - update changelog

* CORDA-680 Update cordapp packages documentation (#1901)

* Introduce MockNetworkParameters

* Cordformation in Kotlin (#1873)

Cordformation rewritten in kotlin.

* Kotlin migration

* Review Comments

* CORDA-704: Implement `@DoNotImplement` annotation (#1903)

* Enhance the API Scanner plugin to monitor class annotations.
* Implement @DoNotImplement annotation, and apply it.
* Update API definition.
* Update API change detection to handle @DoNotImplement.
* Document the `@DoNotImplement` annotation.

* Experimental support for PostgreSQL (#1525)

* Cash selection refactoring such that 3d party DB providers are only required to implement Coin Selection SQL logic.

* Re-added debug logging statement.

* Updated to include PR review feedback from VK

* Refactoring following rebase from master.

* Fix broken JUnits following rebase.

* Use JDBC ResultSet getBlob() and added custom serializer to address concern raised by tomtau in PR.

* Fix failing JUnits.

* Experimental support for PostgreSQL: CashSelection done using window functions

* Moved postgresql version information into corda/build.gradle

* Using a PreparedStatement in CashSelectionPostgreSQLImpl

* Changed the PostgreSQL Cash Selection implementation to use the new refactored AbstractCashSelection

* * Retire MockServiceHubInternal (#1909)

* Introduce rigorousMock
* Add test-utils and node-driver to generated documentation

* Fix-up: Bank Of Corda sample (#1912)

In the previous version when running with `--role ISSUER` the application failed to start.
The reason was that in spite of `quantity` and `currency` were optional,
un-necessary `requestParams` been constructed regardless.

* move SMM

* Interface changes for multi-threading

* CORDA-351: added dependency check plugin to gradle build script (#1911)

* CORDA-351: added dependency check plugin to gradle build script

* CORDA-351: Added suppression stub file with example

* CORDA-351: added suppresionFile property

* CORDA-435 - Ensure Kryo only tests use Kryo serializatin context

Also correct lambda typos (from lamba)

* Network map service REST API wrapper (#1907)

* Network map client - WIP

* Java doc and doc for doc site

* remove javax.ws dependency

* NetworkParameter -> NetworkParameters

* move network map client to node

* Fix jetty test dependencies

* NetworkParameter -> NetworkParameters

* Address PR issues

* Address PR issues and unit test fix

* Address PR issues

* Fixing Bank-Of-Corda Demo in `master` (#1922)

* Fix-up: Bank Of Corda sample

Use correct CorDapp packages to scan

(cherry picked from commit 2caa134)

* Set adequate permissions for the nodes such that NodeExplorer can connect

(cherry picked from commit ae88242)

* Set adequate permissions for the nodes such that NodeExplorer can connect

(cherry picked from commit ae88242)

* Correct run configuration

* Fix-up port numbers

* CORDA-435 - AMQP serialisation cannot work with private vals

They won't be reported as properties by the introspector and thus we
will fail to find a constructor for them. This makes sense as we will be
unable to serialise an object whose members we cannot read

* CORDA-435 - AMQP enablement fixes

AMQP has different serialization rules than Kryo surrounding the way we
introspect objects to work out how to construct them

* [CORDA-442] make MockNetwork not start a networkmap node (#1908)

* [CORDA-442] make MockNetwork not start a networkmap node

Now MockNetwork will put the appropriate NodeInfos inside each running node networkMapCache.

Tests relating to networkmap node starting and interaction have been removed since they where relaying on MockNetwork

* Minor fix for api checker script to support macOS

* Retrofit changes from Enterprise PR #61 (#1934)

* Introduce MockNodeParameters/Args (#1923)

* CORDA-736 Add some new features to corda.jar via node.conf for testing (#1926)

* CORDA-699 Add injection or modification of memory network messages (#1920)

* Updated API stability changeset to reflect new schema attribute name.
2017-10-25 13:54:34 +01:00
Christian Sailer
35ef7d19da Merged fix for TwoPartyTradeFlow not finding the seller identity 2017-10-19 10:44:20 +01:00
Christian Sailer
3297be4a07 Clean up imports 2017-10-19 10:43:15 +01:00
Christian Sailer
c70a7c374e Pick up new implementation of H2CashSelection 2017-10-19 09:53:52 +01:00
Christian Sailer
cf6460592d Replace references to finance packages in unit tests with perftest packages 2017-10-17 14:27:12 +01:00
Christian Sailer
afac8c5728 Rename db tables to have pt in them so states for real cash and perf test cash don't get accidentally mixed up in the db 2017-10-17 14:07:43 +01:00
Christian Sailer
9a145a710a Remove Pt prefix for classes in perftestcordapp 2017-10-17 13:48:20 +01:00
Christian Sailer
f25c15b194 Rename the module/directory from perftestflows to perftestcordapp and clean up module settings 2017-10-17 12:27:08 +01:00