Commit Graph

9524 Commits

Author SHA1 Message Date
Christian Sailer
f25c15b194 Rename the module/directory from perftestflows to perftestcordapp and clean up module settings 2017-10-17 12:27:08 +01:00
Christian Sailer
d0a7ce3a4e Rename the package to com.r3.corda.enterprise.perftestcordapp 2017-10-17 11:58:08 +01:00
Christian Sailer
1241c79d7c Remove Java parts and unused resources 2017-10-17 11:20:18 +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
mkit
5ee784999a Renaming package to com.r3 (#58) 2017-10-16 11:15:35 +01:00
Christian Sailer
81804df1eb Merge pull request #57 from corda/christians-fix-doorman-tests-for-windows
Fix URI use in doorman parameters test so it works on Windows as well
2017-10-13 09:38:54 +01:00
Christian Sailer
39d139dc15 Fix URI use in doorman parameters test so it works on Windows as well 2017-10-10 18:05:41 +01:00
Christian Sailer
7ab94650a6 Cash flows and unit tests 2017-10-10 17:00:36 +01:00
Christian Sailer
e0b684b3ea Simple trade flow for commercial paper 2017-10-10 16:33:16 +01:00
Christian Sailer
1cb4f56609 Added unit tests for commercial paper 2017-10-10 14:58:55 +01:00
Christian Sailer
22bf2b1c1d PtCashTests and missing bits of implementation to make them work 2017-10-10 14:32:18 +01:00
Christian Sailer
8ae92850c9 State and Contract for Cash and CommercialPaper copied to perftestflows 2017-10-10 13:10:21 +01:00
mkit
e22570a81d Adding a new service for CSR signing (#49)
* Adding a new service for CSR signing

* Adding a new service for CSR signing

* Removing rejection option

* Adding CSR log and removing rejection option

* Addressing review comments
2017-10-09 11:34:42 +01:00
Michele Sollecito
e393fdd292 Merge pull request #52 from corda/enterprise-merge-september-26
Enterprise merge september 26
2017-09-27 15:50:25 +01:00
sollecitom
3f5561db1e Fixed Enclavelet 2017-09-27 15:05:18 +01:00
sollecitom
85bc0a38a2 Trying to fix EnclaveletTest.kt
Trying to fix EnclaveletTest.kt

Trying to fix EnclaveletTest.kt

Trying to fix EnclaveletTest.kt

EnclaveletTest passes.

Restored incorrectly removed function in TransactionDSLInterpreter.

Fixed NativeSgxApiTest
2017-09-27 12:04:18 +01:00
sollecitom
9284e731c0 Merge remote-tracking branch 'remotes/open/master' into enterprise-merge-september-26
# Conflicts:
#	core/src/main/kotlin/net/corda/core/crypto/CryptoUtils.kt
#	node-api/src/main/kotlin/net/corda/nodeapi/internal/serialization/Kryo.kt
#	settings.gradle
2017-09-26 18:08:47 +01:00
Michele Sollecito
35924ba737 Upgraded to Kotlin 1.1.50. (#1657) 2017-09-26 14:34:13 +01:00
Patrick Kuo
474a72d1d2 [CORDA-624] Node Explorer on Issuing cash throws MissingContractAttachements exception (#1654) 2017-09-26 14:21:40 +01:00
Ross Nicoll
e1b040ba0e Replace for ..-1 with until (#1513) 2017-09-26 13:37:13 +01:00
Michele Sollecito
63168c0299 [CORDA-481]: GH 965: Java 8 lambdas don't work properly in checkpointing (#1619) 2017-09-26 13:22:59 +01:00
Alberto Arri
246ab26d30 Properly escape backslashes in windows paths (#1556)
* fix some backslashes in the windows paths in the docs


This reverts commit 4532bca580.
2017-09-26 12:54:28 +01:00
Shams Asari
4df8b427d2 Removed SSLConfiguration parameter from CordaRPCClient, thus removing SSL support.
The current use of SSL RPC relies on access to the node's keystore file, and further to that some uses where using the NODE_USER to login on the p2p port.
2017-09-26 10:41:43 +01:00
Viktor Kolomeyko
b4e674c2fe CORDA-540: Implementation of path in the serialization graph (#1484) 2017-09-26 10:31:37 +01:00
Ross Nicoll
da82a0be40 CORDA-499: Dokka cleanup (#1575)
* Make functions in CompositeSignature static
* Make contract IDs constant
* Remove use of "e.g." which Dokka will take as end of the first sentence
* Move example onto function that it actually works with
* Change comment which refers to comment above it, without any linkage, to directly describe the function
* Move implementation notes out of Dokka comment
* Change contract IDs to constants in companion objects
2017-09-26 10:26:44 +01:00
Chris Rankin
04a801e0cd Squashed commit of the following: (#50)
commit 9d8046e310efe860bb9d81e977a323f3905665c1
Author: Haitao Huang <4699115+haitaohuang@users.noreply.github.com>
Date:   Sat Sep 16 11:26:45 2017 -0500

    Check and handle signal interrupts in sockets

    Signed-off-by: Haitao Huang <4699115+haitaohuang@users.noreply.github.com>

commit 960ad91a4a8ec06020273a175471def37870fda6
Author: Haitao Huang <4699115+haitaohuang@users.noreply.github.com>
Date:   Sat Sep 16 11:27:35 2017 -0500

    Add error code in oal for invalid inputs

    Signed-off-by: Haitao Huang <4699115+haitaohuang@users.noreply.github.com>

commit e22c569335c1ec8d18f7df8105a68e9b9a82e691
Author: Li, Xun <xun.li@intel.com>
Date:   Wed Sep 20 10:51:18 2017 +0800

    Update libunwind for glibc 2.26 compatibility

    libunwind should include <signal.h> explicitly.
    glibc change sys/ucontext.h as a bug fix(https://sourceware.org/git/?p=glibc.git;a=commit;h=cfed8ece799b6e6540193a14b41d9de52dc3b08f)

    Signed-off-by: Li, Xun <xun.li@intel.com>

commit 9cda5c4774b2f4fc02fd031f98057cd88d14f2e0
Merge: 94c162c98 36918f071
Author: lzha101 <lili.z.zhang@intel.com>
Date:   Wed Sep 20 09:58:29 2017 +0800

    Merge pull request #165 from corda/chrisr3-stack-protector-fix

    Ensure trts_nsp.cpp is compiled without stack protection.

    Signed-off-by: Zhang Lili lili.z.zhang@intel.com

commit 36918f071fd29c86335b0cea0e072c3f08a51eae
Author: Chris Rankin <chris.rankin@r3.com>
Date:   Tue Sep 19 07:31:57 2017 +0000

    Ensure trts_nsp.cpp is compiled without stack protection.

    Signed-off-by: Chris Rankin <chris.rankin@r3.com>

commit 94c162c98bf95a034eadb41bfa6e6a35f410a0c8
Author: Kai Mast <kaimast@cs.cornell.edu>
Date:   Mon Sep 18 04:07:19 2017 -0400

    g++7 fixes (#148)

    Signed-off-by: Li, Xun<xun.li@intel.com>

commit 8a72fed8737dc8e331889e6530925fc5a0be2ea0
Merge: 2133df2d4 635e3a370
Author: Li Xun <xun.li@intel.com>
Date:   Mon Sep 18 15:58:10 2017 +0800

    Merge pull request #159 from corda/chrisr3-gcc7-fix

    Resolve GCC 7.1 warnings about deprecated throw(std::bad_alloc) in C++11.

    Signed-off-by: Li, Xun <xun.li@intel.com>

commit 635e3a37081ad3f773a0ff24c89f1e6094034d28
Author: Chris Rankin <chris.rankin@r3.com>
Date:   Wed Sep 13 10:31:11 2017 +0100

    Resolve warnings about deprecated throw(std::bad_alloc) in C++11.
2017-09-26 10:22:55 +01:00
Shams Asari
4030903fee Merge pull request #1642 from corda/shams-fix-attachment-demo-test
Fixed AttachmentDemoTest
2017-09-26 09:45:25 +01:00
Katelyn Baker
7c63597937 Merge pull request #1622 from corda/feature/kat/carpenterRespectWhitelist
CORDA-601 - Start adding whitelist support to the carpenter
2017-09-26 09:39:07 +01:00
szymonsztuka
3218fd513d optional warning when adding duplicated key to AppendOnlyPersistenMap (#1635)
* logging duplication warning is optional when adding to AppendOnlyPersistentMap
* suppress warnings in PersistentIdentityService
2017-09-26 09:34:14 +01:00
Shams Asari
faadfd6954 Fixed AttachmentDemoTest 2017-09-26 09:09:06 +01:00
Viktor Kolomeyko
8bab2ae9a1 Derive list of countries from JDK (#1558) 2017-09-26 08:57:28 +01:00
Viktor Kolomeyko
bef640d887 Add integration test to verify that ProcessUtilities work as expected (#1561) 2017-09-26 08:56:51 +01:00
Chris Rankin
8cc091b3e1 Transform Kotlin's EmptyList, EmptySet and EmptyMap into Java classes (#1550)
* Transform Kotlin's EmptyList, EmptySet and EmptyMap into Java classes before serialising them.
* Transform Kotlin's EmptyList, EmptySet and EmptyMap to their unmodifiable Java equivalents.
2017-09-26 08:33:30 +01:00
Ross Nicoll
be0e7a8877 Correct flow calls to generateSpend() (#1643)
Correct flow calls to generateSpend() to match 1.0 API changes
2017-09-25 22:53:49 +01:00
Ross Nicoll
7258c910c8 CORDA-249: Remove cyclic call from CompositeKey (#1602)
Remove cyclic call from `CompositeKey` cycle detection code. Previously when trying to report a cyclic graph in a `CompositeKey`, it called `toString()` which resulted in serialization of the graph, which of course was cyclic, so it failed.
2017-09-25 22:01:13 +01:00
Ross Nicoll
23f16b4b25 CORDA-604: Update cash spending to handle multiple identities (#1534)
Update cash spending to handle multiple identities per node. For test cases nodes typically have a single identity, which we extract using `chooseIdentity()`, however for production environments we need to support nodes having multiple identities they can represent, with none being special.
2017-09-25 22:00:24 +01:00
Clinton
0a9e4f40fe Bumping gradle plugins to match the 1.0.0 major version. (#1640) 2017-09-25 20:26:34 +01:00
Joel Dudley
afc0bbe7ec Adds ToC and internal links. 2017-09-25 18:55:36 +01:00
Ross Nicoll
369d204e7a Add warning to notary demo Cordform extensions (#1477)
Add warning to not use the notary demo Cordform extension pattern, as it's experimental and should be replaced later on.
2017-09-25 18:37:46 +01:00
Ross Nicoll
798e99a588 Move identity service tests (#1548)
Move identity service tests from net.corda.services.network to net.corda.services.identity to match the service classes they correspond to.
2017-09-25 18:30:41 +01:00
Konstantinos Chalkias
6ddb6c7cc2 Command toString signers-keys format (#1609) 2017-09-25 18:25:18 +01:00
Rick Parker
175e53d3d2 Extract identity helpers (#1636)
* First compiling version.  internal package accessed from finance and irsdemo

* Renaming
2017-09-25 17:49:34 +01:00
Mike Hearn
7cc23f007d Docs: add a note to the api index page about version 1.0 and which modules will have a stable API. 2017-09-25 18:38:52 +02:00
Mike Hearn
3386fadec3 Docs: move coding style from "Release process" section to "Other" 2017-09-25 18:38:52 +02:00
Rick Parker
d9715e970e CORDA-205: Supported core types documentation (#1621)
* Outline what is supported in AMQP serialization

* Object graph cycles

* Review feedback.

* Review feedback.

* Review feedback
2017-09-25 17:30:19 +01:00
Clinton
532bbb5cca Contract constraints (#1518)
* Contract constraints and attachment loading

Fix compiler warnings.

Fixed IdentitySyncFlowTests in confidential-identities.

Fixes.

Fix AttachmentClassLoaderTests.

Added a TODO.

Renamed cordapp service.

Fix compilation error in java code.

Fix RaftNotaryServiceTests

Fix AttachmentLoadingTest

Fix DistributedServiceTests and LargeTransactionTests.

Add cordapp packages to Verifier tests.

Refactor DummyContractBackdoor back out of internal package.

Resolve compiler warnings.

Consolidate excluding `isolated` project at top-level.

Fix contract attachment serialisation for remote verifier.

Fix integration tests for client:rpc.

Contract constraints and attachment loading

Fix compiler warnings.

Fixed IdentitySyncFlowTests in confidential-identities.

Fixes.

Fix AttachmentClassLoaderTests.

Added a TODO.

Renamed cordapp service.

Fix compilation error in java code.

Fix example compilation.

Fix RaftNotaryServiceTests

Fix AttachmentLoadingTest

Fix DistributedServiceTests and LargeTransactionTests.

Add cordapp packages to Verifier tests.

Refactor DummyContractBackdoor back out of internal package.

Resolve compiler warnings.

Consolidate excluding `isolated` project at top-level.

Fix integration tests for client:rpc.

Fixed issues with node driver and differing ZIPs.

Review changes.

Refactor GeneratedAttachment into node-api module.

Merge branch 'clint/hash-constraint' of https://github.com/corda/corda into clint/hash-constraint

Fixed compile error following rebase.

wip - test to check that app code isn't loaded from attachments sent over the wire.

Use Kotlin copyTo() rather than Apache's IOUtils.

Fixes

more fixes.

Removing unconstrained output.

More fixes.

Fixed another test.

Added missing plugin definition in net.corda.core.node.CordaPluginRegistry: net.corda.finance.contracts.isolated.IsolatedPlugin

Re-added missing magic string used in unit test.

Remove unused FlowSession variable.

* Review fixes.

* More review fixes.

* Moved Cordapp implementation to an internal package.

* More JVMOverloads.
2017-09-25 17:05:18 +01:00
szymonsztuka
2a7da1eb47 fix create-iou URL (#1633) 2017-09-25 17:01:14 +01:00
josecoll
7b59f80bb3 Vault Query API parameter rename to aid clarity (#1627)
* Vault Query API `contractType` renamed to `contractStateType` for clarity.

* Vault Query API `contractType` renamed to `contractStateType` for clarity.

* Vault Query Criteria attribute `CONTRACT_TYPE` renamed to `CONTRACT_STATE_TYPE` for clarity.

* All references to `contractType` renamed to `contractStateType` for clarity.
2017-09-25 16:02:32 +01:00
Joel Dudley
39bc25e74d Updates tx API page and makes corresponding cookbook changes. (#1624)
* Updates tx API page and makes corresponding cookbook changes.

* Addresses review comments.

* Addresses review comments.

* Addresses review comments.
2017-09-25 16:01:53 +01:00