Commit Graph

11045 Commits

Author SHA1 Message Date
3bb018a5ce Removed the ability to manually start notary nodes from the driver and MockNetwork. Instead by default a single notary is automatically started. This can be customised at creation time of the driver and MockNetwork. This more accurately models the concept of network parameters in a CZ.
Also added helper methods to retrieve this default notary.
2017-11-05 22:55:33 +00:00
405fd8f249 Fix build.gradle files for the IRS demo 2017-11-03 16:22:23 +00:00
68481765e1 Clean up build gradle files 2017-11-03 16:16:23 +00:00
9be37c2b88 Remove useless call to waitUntilNetworkReady within driver started nodes (#1998)
Remove usages of waitUntilNetworkReady in conjunction with driver
2017-11-03 14:27:46 +00:00
22453204ed move node info schema to internal package (#1976) 2017-11-03 11:30:29 +00:00
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
5490465750 [CORDA-446] Remove entities from netmap cache & friends (#1980)
* Remove PersistentNetworkMapService and related classes. They were part of the old network map node code.
2017-11-03 09:28:52 +00:00
837e8800e8 Checking that the smoke tests don't have the node on their classpath. 2017-11-02 20:58:03 +00:00
2e0e78e883 Retire DriverBasedTest. (#1986) 2017-11-02 16:56:08 +00:00
7521675ef2 It's not commonName it's organisation. (#1987) 2017-11-02 16:55:36 +00:00
d882f8871e [CORDA-758]: Permissions are now checked for each RPC method. (#1985)
* Permissions are now checked for each RPC method.

* Fixed NodeMonitorModelTest

* Fixed IRSDemoTest
2017-11-02 15:09:49 +00:00
0f2a98af91 Merge remote-tracking branch 'corda/master' into christians_os_merge_20171031 2017-11-02 14:50:49 +00:00
3e61d13ffe Merge remote-tracking branch 'corda/master' into christians_os_merge_20171031 2017-11-02 14:41:18 +00:00
a21d361df8 Clean up mentions of nodeReady future and friends from MockNetwork/Driver (#1979)
* Clean up mentions of nodeReady future and friends from MockNetwork/Driver
2017-11-02 10:31:31 +00:00
20a6fda357 Correct unchecked cast call (#1973)
Or else NodeExplorer will not start due to exception:
java.lang.ClassCastException: net.corda.core.contracts.StateAndRef cannot be cast to java.lang.Void
	at net.corda.client.jfx.model.ContractStateModel$Companion.filterCashStateAndRefs(ContractStateModel.kt:43)
	at net.corda.client.jfx.model.ContractStateModel$Companion.access$filterCashStateAndRefs(ContractStateModel.kt:38)
	at net.corda.client.jfx.model.ContractStateModel$cashStatesDiff$1.call(ContractStateModel.kt:29)
	at net.corda.client.jfx.model.ContractStateModel$cashStatesDiff$1.call(ContractStateModel.kt:22)
	at rx.internal.operators.OnSubscribeMap$MapSubscriber.onNext(OnSubscribeMap.java:69)
	at rx.internal.operators.OnSubscribeMap$MapSubscriber.onNext(OnSubscribeMap.java:77)
	at rx.subjects.PublishSubject$PublishSubjectProducer.onNext(PublishSubject.java:304)
	at rx.subjects.PublishSubject$PublishSubjectState.onNext(PublishSubject.java:219)
	at rx.subjects.PublishSubject.onNext(PublishSubject.java:72)
2017-11-01 15:38:10 +00:00
b925e6540d [CORDA-446] Remove mentions of networkmap node in DemoBench (#1969)
* [CORDA-446] Remove mentions of networkmap node in DemoBench
2017-11-01 14:28:45 +00:00
00e682a544 [CORDA-446] Clean up other mentions of network map node and logic (#1974)
* [CORDA-446] Clean up other mentions of network map node and logic

* Rename AbstractNetworkMapService to NetworkMapService and remove the empty NetworkMapService

* fix build

* fix artemismessaging tests

* pr comments
2017-11-01 14:25:48 +00:00
86d273f2ef Merge pull request #1955 from corda/feature/kat/refactorKryo
Refactor Kryo into sub module just like AMQP
2017-11-01 10:16:11 +00:00
e564edaa57 Line endings fix. 2017-10-31 20:57:32 +00:00
09c836f5e6 Bumped gradle plugins to 2.0.8 for publishing. 2017-10-31 20:50:26 +00:00
dcaac91691 Cordformation now allows addresses to be used for non-database addresses. (#1917)
Cordformation now allows addresses to be used for non-database addresses.
2017-10-31 20:48:57 +00:00
f614557ae3 Remove SimpleNode it's unused (#1971) 2017-10-31 17:21:17 +00:00
6b2b663ab3 CORDA-716 Retire MockNetwork.Factory (#1937) 2017-10-31 17:10:37 +00:00
bb9c0dee07 Utilities for diffing the deterministic JVM with JDK8 (#86) 2017-10-31 17:05:44 +00:00
6a5f8a2362 Upgraded to gradle 4.3 (#1960)
* Upgraded to gradle 4.3
* Replaced a null check with an elvis expression
2017-10-31 16:44:13 +00:00
d6adb83cd0 CORDA-756 - Refactor Kryo into sub module as per AMQP 2017-10-31 15:45:58 +00:00
7f96205b99 Allow Gradle to set dependency between Jar and ScanApi tasks. (#1962) 2017-10-31 14:14:33 +00:00
6ebba9dea1 Removed the startNotary methods from NodeBasedTest, and moved it into an internal package
This commit is in preparation for the upcoming network parameters work.
2017-10-31 11:49:33 +00:00
3aeacef3bf CORDA-751: Eliminate duplicating entry for classpath when OutOfProcess node is started (#1961)
Please see Jira for background info.
The change should help all the Windows developers.

Closer examination shows that in the command line we include the classpath of size ~20,000 characters twice.
Once with `-cp` option - which is fine and second time with `-Djava.class.path=` - the latter is completely unnecessary and can be eliminated shortening the command length dramatically to around: 24,000 characters which should give us some leg room for further expanding the classpath.
2017-10-31 10:53:35 +00:00
d79d8dad4d Removing exposed reference 2017-10-31 10:48:23 +00:00
4b0b13dad4 CORDA-716 Retire TestDependencyInjectionBase (#1939) 2017-10-31 10:21:38 +00:00
02a5ddb7df Remove Bower dependencies from repo and download them on demand (#1959)
Bower dependencies installed by Gradle as a part of deployment
2017-10-30 16:51:38 +00:00
c3f5ca41e1 ENT-319 Enclave to help test Intel signing key (#76)
* ENT-319 Enclave to help test Intel signing key

* Update build files to allow for release builds

* Strip debug information from release binaries

* Move sign_helper and update references

* Remove paragraph from README

* Two dev modes (simulation and HSM)

* Update make files to take mode and single build directory

* Update reference to self-sign key

* Build script: from_clean.sh

* Fix bad ref to docker-minimal
2017-10-30 14:20:01 +00:00
a74154a126 Merge pull request #1904 from corda/kat/feature/enumEvolver
CORDA-553 - First steps towards evolvability
2017-10-30 14:08:09 +00:00
bad31658fb Fix whitespace 2017-10-30 13:49:08 +00:00
3f43d8ad21 Add helper for checking whether to check checkpoints and unit test it. 2017-10-30 11:55:04 +00:00
9176fcb8e6 Remove for good network map service node (#1942)
* [CORDA-446] Kill network map registration and fix NodeBasedTest
2017-10-30 11:45:52 +00:00
05d6fb91c7 Reinstate Simulation config overrides for notary. (#1947) 2017-10-30 11:41:53 +00:00
851918dd76 CORDA-553 - API standard doc update
The evolution annotations are being added to core which is being flagged
as a breaking API change. Given these are part of the upcoming
introduction of AMQP they're not actually breaking anything we've not
enabled yet
2017-10-30 11:34:54 +00:00
ecbb4330da CORDA-553 - Review comments 2017-10-30 11:15:05 +00:00
ea612246c9 CORDA-742 merge build fixes (#83)
* CORDA-741 changed formatted to true

# Conflicts:
#	gradle-plugins/cordformation/src/main/kotlin/net/corda/plugins/Node.kt

* CORDA-742 Test capsule cache directory

# Conflicts:
#	gradle-plugins/cordformation/src/main/kotlin/net/corda/plugins/Cordform.kt

* CORDA-742 Test capsule cache directory

* CORDA-742 Test capsule cache directory

* CORDA-742 Test capsule cache directory

# Conflicts:
#	gradle-plugins/cordformation/src/main/kotlin/net/corda/plugins/Cordform.kt

* CORDA-742 Refactored back to more parallel execution

# Conflicts:
#	gradle-plugins/cordformation/src/main/kotlin/net/corda/plugins/Cordform.kt

* CORDA-742 Minor refactor

* CORDA-742 Refactors

* CORDA-742 Added constant for cache directory.

* CORDA-742 PR #1951 Moved extension methods into node.

* CORDA-742 PR #1951 Moved extension methods back.

* CORDA-742 PR #1951 Fixed compilation error
2017-10-30 10:21:06 +00:00
0d4c2d3526 Replaces links to Discourse with Stack Overflow links. 2017-10-30 10:09:08 +00:00
cde1587ac7 Cleaned up devModeOptions 2017-10-28 13:26:06 +01:00
8359fe9514 Merge pull request #1950 from corda/christians_checkpoint_checker_thread
checkpoint checker thread
2017-10-27 16:08:10 +01:00
862b908dd9 Merge branch 'master' of https://github.com/corda/corda into christians_checkpoint_checker_thread
# Conflicts:
#	node/src/main/kotlin/net/corda/node/services/config/NodeConfiguration.kt
#	node/src/test/kotlin/net/corda/node/services/config/FullNodeConfigurationTest.kt
2017-10-27 15:33:00 +01:00
5b5a4bd2e4 Code rewiew: turn dev mode options into a data class 2017-10-27 15:13:00 +01:00
a0b9768be7 Retire FullNodeConfiguration (#1954)
* Retire FullNodeConfiguration

* Moved logic and tests for Artermis user names in RPCUserServiceImpl
2017-10-27 14:30:10 +01:00
5440594afd Merge branch 'master' of https://github.com/corda/corda into christians_checkpoint_checker_thread 2017-10-27 14:14:09 +01:00
4e759f3f1b Merge pull request #1943 from corda/gitignoreUpdate
Exclude IntelliJ custom dictionaries from git
2017-10-27 13:11:25 +01:00
3350605536 CORDA-553 - Cope with future transforms 2017-10-27 12:41:23 +01:00