05bc05a936
CORDA-716 Retire withTestSerialization ( #2240 )
2017-12-14 12:42:18 +00:00
2319bf396c
Renamed TestIdentity.key to keyPair and pubkey to publicKey ( #2249 )
2017-12-14 11:30:55 +00:00
c3b9955344
CORDA-716 Fix split packages in testing ( #2232 )
2017-12-12 19:37:01 +00:00
905c8252a6
CORDA-654 Remaining key constants ( #2226 )
2017-12-12 18:03:06 +00:00
08bbf9061e
Introduce TestIdentity. ( #2217 )
2017-12-12 15:52:05 +00:00
537e304536
IRS demo permissions fix ( #2231 )
2017-12-12 13:56:12 +00:00
64c0d41a5d
ENT-1237 Fix run script for IRS Demo web apps
2017-12-12 11:47:14 +00:00
6d6393d984
Merge branch 'feature-network-parameters' into shams-merge-feature-network-parameters
2017-12-11 21:10:34 +00:00
d8c7f0ae23
Inline DUMMY_CASH/OBLIGATION_ISSUER. ( #2214 )
2017-12-11 16:17:20 +00:00
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
4b5c60637c
Merge pull request #2017 from corda/kat/feature/enableAMQP
...
CORDA-780 - Enable AMQP for P2P and Storage Contexts
2017-12-11 11:37:16 +00:00
41bfd7a971
Merge fixes
2017-12-10 20:15:33 +00:00
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
db9eb8a63f
Preliminary work to make merge with master manageable
2017-12-08 13:39:05 +00:00
32ea59d085
Inline some DUMMY constants. ( #2200 )
2017-12-08 10:45:22 +00:00
8878fa99a0
CORDA-553 - Remove CordaCustomSerializer annotation
...
It isn't actually needed as we can scan the jar for classes implementing
the interface.
2017-12-07 21:15:33 +00:00
fcec60e232
CORDA-786 - Use reflection to infer proxy and proxied types in CorDapp custom serializers
...
This removes any need for the user implement and override types from the
super class
* CORDA-786 - Docs update
* CORDA-786 - Remove unneeded second annotation on the proxy objects
* Fix merge conflicts
2017-12-07 21:15:14 +00:00
d25b7f560c
CORDA-786 - Genericise the CorDapp Proxy
2017-12-07 21:15:14 +00:00
81eb0c1898
CORDA-780 / CORDA-786 - Enable AMQP for P2P and Storage Contexts
...
Add plugable mechanism for CorDapps such that they can add their own
custom serializers
2017-12-07 21:13:59 +00:00
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
8461837f1a
Cleaned up Driver.kt so that only the relevant bits are exposed as public API
2017-12-05 23:52:15 +00:00
e4d76204c1
Pass some key constants into MockServices. ( #2173 )
2017-12-05 14:50:56 +00:00
4374c32a75
HttpUtils methods now throw an IOException when a request isn't successful, rather than returning a Boolean. This has been the cause of previous bugs as people forget to check for the false case.
2017-12-04 21:50:19 +00:00
66515d24b5
Merge fixes and fix to attachment demo
2017-12-04 14:35:03 +00:00
6a1aa59e3e
Merge branch 'master' into shams-merge-master-041217
...
# Conflicts:
# node/src/integration-test/kotlin/net/corda/node/services/DistributedServiceTests.kt
# samples/bank-of-corda-demo/src/main/kotlin/net/corda/bank/BankOfCordaCordform.kt
# testing/node-driver/src/main/kotlin/net/corda/testing/NodeTestUtils.kt
# testing/node-driver/src/main/kotlin/net/corda/testing/driver/Driver.kt
# testing/node-driver/src/main/kotlin/net/corda/testing/internal/NodeBasedTest.kt
# testing/node-driver/src/main/kotlin/net/corda/testing/node/MockNode.kt
# testing/node-driver/src/main/kotlin/net/corda/testing/node/NotarySpec.kt
# verifier/src/integration-test/kotlin/net/corda/verifier/VerifierDriver.kt
2017-12-04 13:39:32 +00:00
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
6958cbbc44
Fix demobench as part of network parameters work ( #2148 )
...
* Fix demobench - network parameters
Demobench uses ServiceIdentityGenerator to pregenerate notary identity
for network parameters.
2017-12-01 16:14:03 +00:00
a314a6a125
CORDA-654 Simplify TransactionDSL API ( #2152 )
2017-11-30 16:28:44 +00:00
fdc31091a6
Merge branch 'feature-network-parameters' into shams-master-merge-291117
...
# Conflicts:
# constants.properties
# gradle-plugins/cordformation/src/main/kotlin/net/corda/plugins/Cordform.kt
# gradle-plugins/cordformation/src/main/kotlin/net/corda/plugins/Node.kt
2017-11-30 12:05:42 +00:00
2f0bc249ad
Merge fixes and getting tests to pass
2017-11-30 11:59:39 +00:00
c9f3e98795
Another approach to fixing deployNodes task and network parameters generation ( #2066 )
...
* Generate networkParameteres for Cordformation.
Fix deployNodes task in Cordformation to generate NetworkParameters before running the nodes.
Add TestNetworkParametersGenerator utility loaded after node infos generation step.
* Get rid of bouncy castle provider dependency
For cordform-common. It caused problems with loading our custom
X509EdDSAEngine for generation of network parameters in deployNodes
task.
2017-11-30 10:39:29 +00:00
71763ff1d3
Merge branch 'master' into shams-master-merge-291117
...
# Conflicts:
# node/src/main/kotlin/net/corda/node/internal/AbstractNode.kt
# node/src/main/kotlin/net/corda/node/services/network/PersistentNetworkMapCache.kt
# node/src/test/kotlin/net/corda/node/services/messaging/ArtemisMessagingTests.kt
# samples/notary-demo/src/main/kotlin/net/corda/notarydemo/BFTNotaryCordform.kt
# testing/node-driver/src/main/kotlin/net/corda/testing/driver/Driver.kt
# testing/node-driver/src/main/kotlin/net/corda/testing/internal/demorun/DemoRunner.kt
# testing/node-driver/src/main/kotlin/net/corda/testing/node/MockNode.kt
2017-11-29 18:00:16 +00:00
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
5c53a91785
Overhaul of the Bank of Corda demo to fix two problems it had:
...
1. The runRPCCashIssue and runWebCashIssue gradle tasks didn't work because they were using the wrong ports
2. Notary lookup was failing because the lookup name didn't include the correct CN for the notary name (this slipped through when reverting the network parameters)
The ports change occurred in #1922 which was attempting the fix the runIssuer gradle task. This is actually a misleading and redundant task as all it does is start up the nodes, which is what the documented deployNodes already does. The ports runIssuer allocated to the nodes were different to the ones specified in deployNodes.
To make sure we have integration tests which closely match deployNodes, the BoC demo has been updated to make use of CordformDefinition. This keeps the node definitions in one place, removing the need to have disparate files in sync. runIssuer has been removed.
2017-11-29 14:48:05 +00:00
dbe2dca7b9
CORDA-654 Make VaultFiller a class so I can change its hardcoded bits ( #2141 )
2017-11-29 09:49:34 +00:00
4bd6fef0f9
StateMachineManager is no longer lateinit. ( #2123 )
2017-11-27 17:55:08 +00:00
9fefabbb88
Merge branch 'master' into shams-master-merge-271117
2017-11-27 17:08:13 +00:00
1705df4d1f
Made the database config option typesafe, rather than relying on String properties
2017-11-27 13:51:53 +00:00
449155cea3
IdentityService is no longer obtained lazily. ( #2130 )
2017-11-27 12:34:33 +00:00
9097107d2e
Revert "Revert "Introducing network parameters.""
...
This reverts commit 953a4a3790
2017-11-21 15:05:24 +00:00
37b4d0e939
Fixed some permission issues with demos. ( #2099 )
2017-11-21 11:20:17 +00:00
f26aa33553
Introduce contextLogger ( #2085 )
...
* Revert with comment, probably lazy for a reason.
2017-11-20 11:31:08 +00:00
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
953a4a3790
Revert "Introducing network parameters."
...
This reverts commit d04e487
2017-11-17 10:04:38 +00:00
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
92c8861802
[CORDA-760]: Propagate invocation context across the codebase. ( #2016 )
2017-11-15 14:58:43 +00:00
2fe41715cc
On exit, the driver will automaticallly shutdown any nodes which weren't waited for.
...
The motivation for this came with the recent change that a default notary is started by the driver, which if ignored will leak the notary process.
Also, waitForAllNodesToFinish() has been replaced by a driver parameter.
2017-11-14 20:20:00 +00:00
6a569fb3f1
Retire findTokenizableService. ( #2036 )
2017-11-10 16:40:18 +00:00
052124bbe0
CORDA-716 Make serialization init less static ( #1996 )
2017-11-10 15:44:43 +00:00
449a714478
Merge pull request #1999 from corda/christians_fix_irs-demo-deploy
...
IRS demo gradle files
2017-11-10 11:26:40 +00:00
