Commit Graph

9915 Commits

Author SHA1 Message Date
Christian Sailer
3297be4a07 Clean up imports 2017-10-19 10:43:15 +01:00
mkit
5deb708bb3 Tweaking hibernate to support Azure and H2 dbs (#60) 2017-10-19 10:29:35 +01:00
Konstantinos Chalkias
479ab9a36a [CORDA-694] Commands visibility for Oracles (without sacrificing privacy) (#1835)
new checkCommandVisibility feature for Oracles
2017-10-19 10:21:20 +01:00
Christian Sailer
f579393d88 Merge branch 'master' of https://github.com/corda/enterprise into christians_perftestflows 2017-10-19 09:54:06 +01:00
Christian Sailer
c70a7c374e Pick up new implementation of H2CashSelection 2017-10-19 09:53:52 +01:00
Andrzej Cichocki
717365413d Update customSchemas documentation. (#1902) 2017-10-19 09:26:40 +01:00
Andrzej Cichocki
b2454c646c Eliminate circular dependency of NodeSchedulerService on ServiceHub. (#1891) 2017-10-19 09:26:26 +01:00
Tommy Lillehagen
40b1eca0aa Merge pull request #70 from corda/tlil/ci-fix
Fix bad Avian dir references in Makefile
2017-10-19 09:19:58 +01:00
Tommy Lillehagen
a337d1a60b Fix bad Avian dir references in Makefile 2017-10-18 22:53:15 +01:00
Patrick Kuo
42b0db242e Upgrade the doorman to persist the stored network map entries + serving (#54)
* Upgrade the doorman to persist the stored network map entries + serving

* fixup after rebase

* address PR issues

* address PR issues

* return 400 bad request instead of unauthorized
2017-10-18 15:19:17 +01:00
josecoll
cf3b080d0c Added missing cordappPackage dependencies. (#1894) 2017-10-18 14:54:47 +01:00
Alberto Arri
b33b013284 [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)
2017-10-18 13:49:32 +01:00
Andrzej Cichocki
b4c53647cd 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
2017-10-18 13:40:57 +01:00
josecoll
5f98993324 Merge pull request #61 from corda/hcoll-eliminate-binary-public-key-as-db-key
ENT-980 Eliminate use of PublicKey (as string or binary) as primary key in database
2017-10-18 13:26:25 +01:00
Viktor Kolomeyko
aa41120f6c Disable unstable test on Windows (#1899) 2017-10-18 11:20:51 +01:00
josecoll
c2ff4b74e4 Make const MAX_HASH_HEX_SIZE internal 2017-10-18 10:04:19 +01:00
Viktor Kolomeyko
c621c7d123 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.
2017-10-18 09:14:03 +01:00
Patrick Kuo
aa5b35a658 Upgrade doorman corda dependancies to v1.0 (#66)
* upgrade corda dependancy to v1.0.0

* fixup after corda upgrade

* fix CordaX500Name problem for root cert and intermediate cert

* fixup after rebase

* fix dependencies problem

* add back dev repo
2017-10-17 18:59:53 +01:00
Tommy Lillehagen
9f834b1495 Merge pull request #63 from corda/tlil/sgx-build-files
Add missing build dependencies and build JDK without X11
2017-10-17 16:21:09 +01:00
Christian Sailer
1340b037c6 Merge branch 'master' of https://github.com/corda/enterprise into christians_perftestflows 2017-10-17 15:29:03 +01:00
josecoll
698b91bc5e Fix after rebase. 2017-10-17 15:25:01 +01:00
Christian Sailer
3a22962815 Merge pull request #59 from corda/christians-fix-unittests-for-windows
Fix unittests for windows
2017-10-17 15:24:38 +01:00
josecoll
b861f4b7cb Standardise Public Key hash size as per discussions with KC. 2017-10-17 14:31:21 +01:00
josecoll
cda3ecbc0a Revert DBPartyAndCertificate change: PK should be party name (not owningKeyHash). 2017-10-17 14:30:34 +01:00
josecoll
72ad9a51fe Use SecureHash extension method. 2017-10-17 14:30:03 +01:00
josecoll
744f2c658a Explicitly set length of key hash to 64. 2017-10-17 14:29:38 +01:00
josecoll
0e5346caa1 Updated DB schemas from using string'ified key to use hash of key. 2017-10-17 14:29:36 +01:00
szymonsztuka
20e0e63eed Change string of PublicKey to hash as database primary key. 2017-10-17 14:27:20 +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
Tommy Lillehagen
fdf29f3c58 Update docker container and JDK make file
* Add missing build dependencies to `docker-minimal`
 * Build JDK without ALSA, CUPS, FreeType, Pulse and X11
2017-10-17 14:02:34 +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
Shams Asari
3372e49898 Fixed the node shell to work with the DataFeed class 2017-10-17 12:27:01 +01:00
Christian Sailer
d0a7ce3a4e Rename the package to com.r3.corda.enterprise.perftestcordapp 2017-10-17 11:58:08 +01:00
szymonsztuka
571c1ff31f merge open source to enterprise
* merge of open source master since the previous merge (changes between Sep 26, 2017 - Oct 16, 2017)

* New differences between O/S and Enterprise branches:
- top level build.gradle references enterprise repository:
 ` publish { .. repository { repoKey = 'enterprise-dev'`

- README.md links to enterprise build status:
href="https://ci-master.corda.r3cev.com/viewType.html?buildTypeId=CordaEnterprise_Build&tab=buildTypeStatusDiv"
2017-10-17 11:55:09 +01:00
Christian Sailer
1241c79d7c Remove Java parts and unused resources 2017-10-17 11:20:18 +01:00
szymonsztuka
6a00df322b reference to finance module via not hardcoded group ID (#1515)
*  generic way to reference to group id when loading finance.jar via cordapp
2017-10-17 11:03:49 +01:00
Viktor Kolomeyko
cac3057877 CORDA-540: Make Verifier work in AMQP mode (#1870) 2017-10-17 10:44:27 +01:00
Christian Sailer
894e407057 Updated modules in compiler.xml 2017-10-17 09:54:55 +01:00
Christian Sailer
4ecc7e9ace Merge branch 'master' of https://github.com/corda/enterprise into christians_perftestflows 2017-10-17 09:47:22 +01:00
szymonsztuka
c436984462 Merge from Corda master - fix compilation errors 2017-10-16 19:08:51 +01:00
szymonsztuka
db0969ebda Merge from Corda master 2017-10-16 18:03:07 +01:00
Ross Nicoll
63b7eb3f70 CORDA-654: Move from chooseIdentity() to singleIdentity() (#1819)
Move from `chooseIdentity()` to `singleIdentity()` where tests use a single identity, or to fetching by name where multiple identities are present, so we stop using the first identity as special.
2017-10-16 15:51:26 +01:00
Joel Dudley
d8b81f755a Makes docs fixes flagged by various internals. 2017-10-16 15:15:02 +01:00
Joel Dudley
d3e8df1644 Separates out the tutorial code into separate docs to ensure it compiles. 2017-10-16 14:39:28 +01:00
Christian Sailer
d8462ad662 Make it handle whitespace in paths correctly - even better by using toURI() 2017-10-16 14:36:43 +01:00
Christian Sailer
ead805fb21 Make it handle whitespace in paths correctly (needs to be URL decoded) 2017-10-16 14:32:16 +01:00
mkit
83b9080502 Adding an option to override the default isolation level on per transaction basis (#1886) 2017-10-16 14:03:51 +01:00
josecoll
2a68e23e69 Improved Cash Selection interface (#1858)
* 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.
2017-10-16 13:47:35 +01:00