Shams Asari
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
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
Shams Asari
d5e3f28303
Removed remaining references to networkMapService
2017-12-01 20:57:58 +00:00
Shams Asari
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
Katarzyna Streich
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
Shams Asari
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
Shams Asari
4ca54b73fe
Added tests to make sure the platform version is correctly available
2017-11-27 17:04:19 +00:00
Shams Asari
9097107d2e
Revert "Revert "Introducing network parameters.""
...
This reverts commit 953a4a3790
2017-11-21 15:05:24 +00:00
Andrzej Cichocki
f26aa33553
Introduce contextLogger ( #2085 )
...
* Revert with comment, probably lazy for a reason.
2017-11-20 11:31:08 +00:00
Shams Asari
953a4a3790
Revert "Introducing network parameters."
...
This reverts commit d04e487
2017-11-17 10:04:38 +00:00
Andrzej Cichocki
687a992262
CORDA-716 Make asContextEnv available to smoketesting ( #2039 )
2017-11-13 18:28:54 +00:00
Shams Asari
d04e48740b
Introducing network parameters.
...
network-parameters file read in by the node at startup, of which only the list of notaries is used. For now, the driver and MockNetwork have been updated to require notaries to be started first. This is so that the same set of network parameters can be defined for all the nodes.
CN in the legal name is not longer disallowed since it's no longer reserved for distributed notary names.
Single-node notaries now only have one identity, their main identity. Nodes part of a cluster continue to have two.
(Based off Kasia's work)
2017-11-03 09:46:10 +00:00
Shams Asari
837e8800e8
Checking that the smoke tests don't have the node on their classpath.
2017-11-02 20:58:03 +00:00
Rick Parker
4b8590ef41
CORDA-736 Add some new features to corda.jar via node.conf for testing ( #1926 )
2017-10-24 16:49:47 +01:00
Tommy Lillehagen
fcc4bdae7e
Reformat files in testing
2017-10-09 15:26:40 +01:00
Shams Asari
727cd0e55c
Cleaned up notary configuration by introducing a notary config option.
...
extraAdvertisedServiceIds is no longer used for this.
2017-10-07 12:52:37 +01:00
Ross Nicoll
de3468f8a7
Replace X500Name with CordaX500Name ( #1447 )
...
Replace X500Name with CordaX500Name, which enforces the specific constraints Corda expects on legal/service identity names.
2017-09-12 01:03:10 +01:00
Patrick Kuo
57412d4498
Enforce X500Name format defined in design doc ( #1427 )
...
* Standardise X500Name format - WIP
* address PR issues
* failing test fix and replace X500Name with getX500Name
* gradle plugin fix
* Added country code validation
2017-09-07 14:47:42 +01:00
Andrzej Cichocki
579abda044
Group test scope modules in testing dir ( #1419 )
2017-09-05 18:27:26 +01:00
