ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2024-12-28 16:58:55 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity
9,912 Commits 91 Branches 405 Tags 354 MiB
c56ea4088f
Commit Graph

9912 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alberto Arri
c56ea4088f
fix enterprise build (#108) 
fix enterprise build
 2017-11-14 17:27:03 +00:00
mkit
40cf4ad191
Small clean-up (#98) 
* Small clean-up

* Unifying enum casing

* Adding TODOs
 2017-11-14 09:44:48 +00:00
mkit
1ec40ee983
Network Map signing (#87) 
* Network Map signing

* Fixing failing tests

* Fixing integration tests

* Addressing review comments

* Addressing review comments

* Rebasing to the new network parameters + network map ownership redesign

* Addressing review comments

* Addressing review comments

* Splitting the PR

* Reverting enum uppercasing

* Fixing the NetworkMapEntity comment

* Addressing review comments - round 3

* Fixing docs and adding some TODOS

* Removing nullification of the common name
 2017-11-14 08:29:07 +00:00
szymonsztuka
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
Alberto Arri
523a6db0b9
ENT-990 Make doorman read an initial set of Network parameters from d… (#96) 
ENT-990 Make doorman read an initial set of Network parameters from disk at start-up time
 2017-11-13 15:40:44 +00:00
mkit
4c7dc58135
Adding HSM simulator to integration tests (#92) 
* Adding HSM simulator to integration tests

* Addressing review comments

* Adjusting implementation to the agreed TC setup

* Addressing review comments

* Addressing review comments - round 2
 2017-11-13 11:50:24 +00:00
mkit
12124bc0d9
Fixing failing build for the IntelliJ plugin (#100) 2017-11-13 10:25:11 +00:00
Tommy Lillehagen
7b714f5bc7
ENT-975 Track unchanged files in extra-info (#99) 2017-11-10 08:49:36 +00:00
Alberto Arri
4686d59a4a
Merge pull request #97 from corda/arri_fixdoorman_help 
Fix the description of --mode flag in doorman
 2017-11-09 11:26:26 +00:00
alberto.arri@r3.com
bc2fd3948f Fix the description of --mode flag in doorman 2017-11-09 10:14:22 +00:00
Konstantinos Chalkias
6838aba8e4
Merge pull request #81 from corda/kostas-DEVSGX_HSM_PROFILE 
Two dev modes (simulation and hsm)
 2017-11-09 10:08:10 +00:00
Chris Rankin
148152ba40
Fix Gradle warning for SGX hsm-tool project. (#95) 
* Fix Gradle warning for SGX hsm-tool project.
* Prefix project name with "sgx-".
 2017-11-08 12:29:38 +00:00
Christian Sailer
fd94732261
Merge pull request #93 from corda/christians_os_merge_20171106 
Merge OS -> enterprise as of 20171106
 2017-11-07 09:42:27 +00:00
Christian Sailer
8b55f415bd Merge branch 'master' of https://github.com/corda/corda into christians_os_merge_20171106 2017-11-06 17:37:30 +00:00
Christian Sailer
7765de0bf9 Merge branch 'master' of https://github.com/corda/corda into christians_os_merge_20171106 2017-11-06 17:27:13 +00:00
Christian Sailer
7800b6cb4a
Merge pull request #89 from corda/christians_os_merge_20171031 
OpenSource -> Enterprise
 2017-11-06 12:50:17 +00:00
Chris Rankin
41e0be1958
Exit code is between 0-255. So protect against VERY unlikey chance of overflow. (#2000) 2017-11-06 11:54:48 +00:00
Christian Sailer
f12bec8496 Add version pinning directives to work arond the spring.boot plug-in's shortcomings 2017-11-06 11:42:53 +00:00
Andrzej Cichocki
00a9014852
CORDA-716 Rename one TestClock to DemoClock, and unduplicate code (#1988) 2017-11-06 11:13:56 +00:00
Andrzej Cichocki
9baa9037ae
Retire marker interface. (#1997) 2017-11-06 10:53:02 +00:00
Shams Asari
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
Christian Sailer
405fd8f249 Fix build.gradle files for the IRS demo 2017-11-03 16:22:23 +00:00
Alberto Arri
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
Patrick Kuo
22453204ed
move node info schema to internal package (#1976) 2017-11-03 11:30:29 +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
Alberto Arri
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
Shams Asari
837e8800e8 Checking that the smoke tests don't have the node on their classpath. 2017-11-02 20:58:03 +00:00
Andrzej Cichocki
2e0e78e883
Retire DriverBasedTest. (#1986) 2017-11-02 16:56:08 +00:00
Andrzej Cichocki
7521675ef2
It's not commonName it's organisation. (#1987) 2017-11-02 16:55:36 +00:00
Michele Sollecito
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
Christian Sailer
0f2a98af91 Merge remote-tracking branch 'corda/master' into christians_os_merge_20171031 2017-11-02 14:50:49 +00:00
Christian Sailer
3e61d13ffe Merge remote-tracking branch 'corda/master' into christians_os_merge_20171031 2017-11-02 14:41:18 +00:00
Alberto Arri
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
Viktor Kolomeyko
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
Alberto Arri
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
Alberto Arri
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
Katelyn Baker
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
Clinton Alexander
e564edaa57 Line endings fix. 2017-10-31 20:57:32 +00:00
Clinton Alexander
09c836f5e6 Bumped gradle plugins to 2.0.8 for publishing. 2017-10-31 20:50:26 +00:00
Clinton
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
Alberto Arri
f614557ae3
Remove SimpleNode it's unused (#1971) 2017-10-31 17:21:17 +00:00
Andrzej Cichocki
6b2b663ab3
CORDA-716 Retire MockNetwork.Factory (#1937) 2017-10-31 17:10:37 +00:00
Tommy Lillehagen
bb9c0dee07
Utilities for diffing the deterministic JVM with JDK8 (#86) 2017-10-31 17:05:44 +00:00
Clinton
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
Katelyn Baker
d6adb83cd0 CORDA-756 - Refactor Kryo into sub module as per AMQP 2017-10-31 15:45:58 +00:00
Chris Rankin
7f96205b99
Allow Gradle to set dependency between Jar and ScanApi tasks. (#1962) 2017-10-31 14:14:33 +00:00
Shams Asari
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
Viktor Kolomeyko
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
Richard Green
d79d8dad4d Removing exposed reference 2017-10-31 10:48:23 +00:00
Andrzej Cichocki
4b0b13dad4
CORDA-716 Retire TestDependencyInjectionBase (#1939) 2017-10-31 10:21:38 +00:00