Andrzej Cichocki
a652c8b19f
Merge commit '22af527b7943c0c4376af582de6505893817111a' into andr3ej-ross-merge
...
# Conflicts:
# docs/source/changelog.rst
2017-12-19 17:07:17 +00:00
Ross Nicoll
21f0892deb
CORDA-831: Add roles to X509 certificates ( #2180 )
...
* Add roles to X509 certificates so that the identity service can always determine which certificate in a hierarchy is the well known identity
* Rename CLIENT_CA certificate type to NODE_CA
* Rename DOORMAN role to INTERMEDIATE_CA
* Correct issue in CashTests where instead of providing a well known identity to generateSpend(), a confidential identity was passed in and a confidential identity generated from it.
* Enforce role hierarchy in PKI
* Enforce that party certificates must be well known or confidential identities
* Add network map certificate role
2017-12-18 16:23:34 +00:00
josecoll
e9fc6f7c8d
Merge remote-tracking branch 'open/master' into colljos-os-merge-rc01
2017-12-18 10:24:38 +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
Andrzej Cichocki
479a656484
CORDA-716 Consistent MockServices API ( #2247 )
...
* Consistent MockServices API.
* Fix compile error.
2017-12-15 13:15:05 +00:00
Andrzej Cichocki
21e1118ea0
Make test constants Java-visible fields. ( #2258 )
2017-12-14 16:30:18 +00:00
Andrzej Cichocki
05bc05a936
CORDA-716 Retire withTestSerialization ( #2240 )
2017-12-14 12:42:18 +00:00
Shams Asari
2319bf396c
Renamed TestIdentity.key to keyPair and pubkey to publicKey ( #2249 )
2017-12-14 11:30:55 +00:00
josecoll
4e42fff7d4
Fix broken integration test following rebase from OS master (mostly test utils identity constant redefinitions / renaming)
2017-12-13 12:34:06 +00:00
josecoll
d1998b2c94
Merge remote-tracking branch 'open-hc02/master' into colljos-os-hc02-merge-121217
2017-12-13 11:02:58 +00:00
Andrzej Cichocki
d6df251e36
Bypass needless lookup. ( #2236 )
2017-12-12 21:51:32 +00:00
Andrzej Cichocki
c3b9955344
CORDA-716 Fix split packages in testing ( #2232 )
2017-12-12 19:37:01 +00:00
Andrzej Cichocki
905c8252a6
CORDA-654 Remaining key constants ( #2226 )
2017-12-12 18:03:06 +00:00
Ross Nicoll
42782f8890
ENT-1151: Rework unicode block validation rules ( #2125 )
...
* Redo legal name validation rules so that direction change chars are rejected
* Split name validation into minimal rules that all nodes can require, plus extended rules that the Doorman will apply (and we may need to change, without updating the entire network).
* Break down name validation rule sets to better match expectations
* Add test for nulls in Corda names
2017-12-12 16:52:14 +00:00
josecoll
499de12620
Merge remote-tracking branch 'open-hc02/master' into colljos-os-hc02-merge-121217
2017-12-12 11:22:57 +00:00
Shams Asari
6d6393d984
Merge branch 'feature-network-parameters' into shams-merge-feature-network-parameters
2017-12-11 21:10:34 +00:00
Andrzej Cichocki
d8c7f0ae23
Inline DUMMY_CASH/OBLIGATION_ISSUER. ( #2214 )
2017-12-11 16:17:20 +00:00
Andrzej Cichocki
544e19e277
CORDA-654 Remove key constants from NodeTestUtils ( #2205 )
...
* DUMMY_NOTARY was hiding in a couple more places
2017-12-11 11:44:01 +00:00
josecoll
8a6e9c52f3
Merge remote-tracking branch 'open-hc01/master' into colljos-os-hc01-merge-111217
2017-12-11 09:21:52 +00:00
Shams Asari
65ff931f53
Merge branch 'master' into shams-master-merge-081217
...
# Conflicts:
# node-api/src/main/kotlin/net/corda/nodeapi/internal/crypto/KeyStoreWrapper.kt
# node/src/main/kotlin/net/corda/node/internal/AbstractNode.kt
# node/src/main/kotlin/net/corda/node/services/config/ConfigUtilities.kt
# node/src/test/kotlin/net/corda/node/services/identity/InMemoryIdentityServiceTests.kt
# node/src/test/kotlin/net/corda/node/services/identity/PersistentIdentityServiceTests.kt
# samples/irs-demo/src/integration-test/kotlin/net/corda/test/spring/SpringDriver.kt
# testing/node-driver/src/integration-test/kotlin/net/corda/testing/driver/DriverTests.kt
# testing/node-driver/src/main/kotlin/net/corda/testing/driver/Driver.kt
# testing/node-driver/src/main/kotlin/net/corda/testing/driver/DriverDSL.kt
# testing/node-driver/src/main/kotlin/net/corda/testing/internal/DriverDSLImpl.kt
# testing/node-driver/src/main/kotlin/net/corda/testing/internal/NodeBasedTest.kt
# testing/node-driver/src/main/kotlin/net/corda/testing/internal/RPCDriver.kt
# testing/node-driver/src/main/kotlin/net/corda/testing/internal/demorun/DemoRunner.kt
# testing/test-utils/src/main/kotlin/net/corda/testing/CoreTestUtils.kt
# verifier/src/integration-test/kotlin/net/corda/verifier/VerifierDriver.kt
2017-12-08 16:03:16 +00:00
Ross Nicoll
e6adbe7137
CORDA-831: Add confidential identity certificate type ( #2198 )
...
* Rename certificate types
* Create separate certificate type for confidential identities
* Add name constraints to dev node CA
* Move dev node CA into getTestPartyAndCertificate()
2017-12-08 13:17:29 +00:00
Andrzej Cichocki
32ea59d085
Inline some DUMMY constants. ( #2200 )
2017-12-08 10:45:22 +00:00
Andrzej Cichocki
c36bea3af5
CORDA-654 MockServices no longer has hard-coded identities ( #2192 )
...
* Resurrect a test
* Fix a broken test
* Pass in the initial identity
* Make IdentityService easier to mock
2017-12-07 11:55:18 +00:00
Shams Asari
cb11379d98
Addressing some of the technical debt
2017-12-06 22:01:41 +00:00
Shams Asari
8461837f1a
Cleaned up Driver.kt so that only the relevant bits are exposed as public API
2017-12-05 23:52:15 +00:00
szymonsztuka
cb43091ff8
Merge Open Source into Enterprise
...
# Resolved conflicts:
# core/src/main/kotlin/net/corda/core/node/services/TransactionStorage.kt
# node/src/integration-test/kotlin/net/corda/node/BootTests.kt
# node/src/integration-test/kotlin/net/corda/node/CordappScanningDriverTest.kt
# node/src/integration-test/kotlin/net/corda/node/NodePerformanceTests.kt
# node/src/integration-test/kotlin/net/corda/node/SSHServerTest.kt
# node/src/integration-test/kotlin/net/corda/node/services/AttachmentLoadingTests.kt
# node/src/integration-test/kotlin/net/corda/test/node/NodeStatePersistenceTests.kt
# node/src/main/kotlin/net/corda/node/Corda.kt
# node/src/main/kotlin/net/corda/node/internal/AbstractNode.kt
# node/src/main/kotlin/net/corda/node/internal/StartedNode.kt
# node/src/test/kotlin/net/corda/node/services/events/NodeSchedulerServiceTest.kt
# samples/attachment-demo/src/integration-test/kotlin/net/corda/attachmentdemo/AttachmentDemoTest.kt
# samples/trader-demo/src/integration-test/kotlin/net/corda/traderdemo/TraderDemoTest.kt
# testing/node-driver/src/main/kotlin/net/corda/testing/NodeTestUtils.kt
# testing/node-driver/src/main/kotlin/net/corda/testing/internal/NodeBasedTest.kt
# testing/node-driver/src/main/kotlin/net/corda/testing/node/MockServices.kt
2017-12-05 17:35:54 +00:00
Andras Slemmer
63027a077d
State machine rewrite
2017-12-05 11:36:20 +00:00
Shams Asari
5264072752
Renamed n.c.nodeapi.config to n.c.nodeapi.internal.config as that config code is not public API. For the same reason, also moved User into the same internal package.
2017-12-03 17:20:30 +00:00
Michele Sollecito
1f0571306b
Showcase of closures registered as flows. ( #2162 )
2017-12-01 14:31:52 +00:00
Andrzej Cichocki
a314a6a125
CORDA-654 Simplify TransactionDSL API ( #2152 )
2017-11-30 16:28:44 +00:00
Shams Asari
286ff65e60
Merge pull request #2147 from corda/shams-doorman-node-persistence-deps
...
Moved CordaPersistence and dependent classes into internal package in…
2017-11-29 17:51:35 +00:00
Andrzej Cichocki
3c31fdf31d
CORDA-806 Remove initialiseSerialization from rpcDriver ( #2084 )
...
and fix a leak or two
2017-11-29 17:42:39 +00:00
Shams Asari
b638b30d2a
Moved CordaPersistence and dependent classes into internal package in node-api. This is so that the doorman can make use of them without needing a compile dependency to node.
2017-11-29 17:14:05 +00:00
Andrzej Cichocki
74bf00c155
Show origin test in ThreadLeakException. ( #2143 )
...
and downgrade an error to warn
2017-11-28 14:11:22 +00:00
Andrzej Cichocki
4bd6fef0f9
StateMachineManager is no longer lateinit. ( #2123 )
2017-11-27 17:55:08 +00:00
Shams Asari
2ceb6283af
Moved X509Utilities, and some other crypto utilities in node, into node-api so that they can be used by services outside of the node.
...
There's also some cleanup as well.
2017-11-27 15:49:33 +00:00
Maksymilian Pawlak
ce9b6c1f18
CORDA-311-post PR merged fixes ( #2106 )
...
* SSH server integration
2017-11-23 16:34:57 +00:00
Ross Nicoll
22d29db54b
Add X500 name constraints for non-organisation attributes ( #2108 )
...
Enforce X500 name constraints consistently across all attributes
2017-11-22 18:00:43 +00:00
Shams Asari
f7e51a9ae1
Various cleanups to AMQP and Kryo serialisation:
...
* PartyAndCertificate serialiser has been converted to deal with just CertPath
* Removed X500Name serialiser as we no longer use the BC implementation and have our own CordaX500Name
* Converted X509 cert serialiser to use Java certs and not BC X509 cert holder
* Added to test to AMQP serialisation to make sure c'tor is invoked on deserialisation
2017-11-21 14:01:03 +00:00
Andrzej Cichocki
288eb5fcc4
CORDA-716 Call stop on InMemoryMessagingNetwork ( #2077 )
...
* Inline code used by only 1 test
* Remove superfluous interface
* Warnings crusade
* Inline Builder, remove unused method
* Remove stop from interface
* Register stops up-front
2017-11-21 12:49:21 +00:00
Maksymilian Pawlak
e63b6d1386
CORDA-311 Shell via SSH server ( #2087 )
...
* SSH server integration
2017-11-20 17:41:38 +00:00
Ross Nicoll
19aba62fc6
Move tests to using named identities ( #1879 )
...
Move tests to using named identities in preparation for multiple identities work. Includes:
* NetworkMapCacheTest
* NodeInterestRatesTest
* NodeVaultServiceTest
* ContractUpgradeFlowTest
* Cash tests
* AttachmentSerializationTest
* CordaRPCOpsImplTest
* VaultWithCashTest
* ScheduledFlowTests
2017-11-17 14:16:17 +00:00
Andrzej Cichocki
787de9d956
CORDA-716 Fix last of the test thread leaks ( #2069 )
...
* copycat servers/clients
* an SMM CheckpointChecker
* and log error rather than fail on propagation of stale inheritable thread local
2017-11-17 12:28:34 +00:00
Ross Nicoll
e4f5e16bf4
Clean up identities in tests, stage 1 ( #2059 )
...
* Clean up identities in CashTests so that the mini/mega corp keys and identities are correctly
paired together throughout. Previously `miniCorpServices` presented the same key as the
MegaCorp identity, but with the name Mini Corp attached.
* Correct key/name matches in VaultWithCashTest
* Split services in CashTests to not have multiple identities per service hub
2017-11-16 17:17:45 +00:00
Michele Sollecito
92c8861802
[CORDA-760]: Propagate invocation context across the codebase. ( #2016 )
2017-11-15 14:58:43 +00:00
Andrzej Cichocki
c4a9320e70
CORDA-716 Don't allow the netty global executor to inherit serialization env holder ( #2048 )
...
and close some dangling RPC connections.
2017-11-15 11:22:35 +00:00
Andrzej Cichocki
052124bbe0
CORDA-716 Make serialization init less static ( #1996 )
2017-11-10 15:44:43 +00:00
Andrzej Cichocki
6b71c6cf75
Retire some initialiseSerialization booleans. ( #2019 )
2017-11-10 10:15:55 +00:00
