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
737cd7edba
Improved SQL test setup for Azure SQL and SQL Server ( #152 )
...
* Improved SQL scripts for SQL Server and Azure to drop user/permissions on class setup not on test setup
* Set Micorsoft JDBC driver as compile time dependency.
* Database testing description.
* New table node_mutual_exclusion added to SQL test setup scripts.
2017-12-07 16:26:17 +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
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
e4d76204c1
Pass some key constants into MockServices. ( #2173 )
2017-12-05 14:50:56 +00:00
63027a077d
State machine rewrite
2017-12-05 11:36:20 +00:00
fad29ff1f6
R3NET-546: Improve the way CheckMembership operation is performed ( #140 )
2017-12-05 10:49:57 +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
709b3791a3
SQL Azure and SQL Server database integration tests ( #115 )
...
* Integration test are parameterised (extends IntegrationTest) to run against a remote database with 4 db scripts run @BeforeClass, @Before, @After and @AfterClass.
* SQL script for SQL Azure and SQL Server databases and templates of JDBC configuration.
2017-12-01 17:17:51 +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
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
2bdd8b681d
Merge OS to Enterprise.
...
Main differences preserved in Enterprise version:
* constants.properties: platform version 1 (OS has 2)
* gradle-wrapper.properties: higher Gradle version gradle-4.3.1 (OS has gradle-4.3)
* Driver.kt - setting system property "user.dir"
2017-11-30 23:54:12 +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
e8d833c2fe
Merge remote-tracking branch 'open/master' into features/ENT-1153/merge_OS2ENT
...
# Conflicts:
# .idea/compiler.xml
# docs/source/changelog.rst
# node/src/test/kotlin/net/corda/node/services/transactions/DistributedImmutableMapTests.kt
# testing/node-driver/src/main/kotlin/net/corda/testing/NodeTestUtils.kt
# testing/node-driver/src/main/kotlin/net/corda/testing/node/MockServices.kt
2017-11-27 16:52:29 +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
c516a4b028
R3NET-546: Business Network PoC work ( #101 )
2017-11-24 09:59:35 +00:00
0f8baae962
Merge opensource into master
2017-11-21 18:53:14 +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
7a9364c8d5
Merge remote-tracking branch 'open/master' into colljos-merge-171117
...
# Conflicts:
# .idea/compiler.xml
# build.gradle
# client/rpc/src/integration-test/kotlin/net/corda/client/rpc/CordaRPCClientTest.kt
# docs/source/changelog.rst
# node/src/integration-test/kotlin/net/corda/node/services/AttachmentLoadingTests.kt
# node/src/main/kotlin/net/corda/node/internal/StartedNode.kt
# node/src/main/kotlin/net/corda/node/utilities/registration/HTTPNetworkRegistrationService.kt
# samples/network-visualiser/build.gradle
# samples/simm-valuation-demo/src/integration-test/kotlin/net/corda/vega/SimmValuationTest.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/node/MockNode.kt
2017-11-17 15:11:24 +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
359610ff14
Ability to run integration tests against standalone databases
...
* Additional database confing and implied property ${nodeOrganizationName}.
* Integration tests extend from base class which allows to configure database connection (in-memory/remote db) and to run setup/tear down SQL scripts.
2017-11-13 17:29:57 +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
6b71c6cf75
Retire some initialiseSerialization booleans. ( #2019 )
2017-11-10 10:15:55 +00:00
