ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-03-19 18:45:28 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity
11,869 Commits 99 Branches 407 Tags
Commit Graph

1013 Commits

Author SHA1 Message Date
Thomas Schroeter
23a0a66128 Merge remote-tracking branch 'open-source/master' into thomas-merge-3d50e73271cb3bbd95822575349995c9771729dd 2018-05-16 15:30:46 +01:00
Andrzej Cichocki
65b782c206
ENT-933 Add spectator and participant profiles of rigorousMock (#3157) 2018-05-16 13:56:41 +01:00
Katarzyna Streich
b06738b371
CORDA-1093 Deleting node info from directory (#3115) 
* CORDA-1093 Deleting node info from directory

Deleting NodeInfo from additional-node-infos directory should remove it from cache.
 2018-05-16 11:45:59 +01:00
cburlinchon
d53d910693
ENT-1824 Mutual Exclusion sleep (#841) 
* Another host is detected as leader, sleep till lease expires
 2018-05-15 16:48:37 +01:00
Andras Slemmer
32aa1bf9d2
Merge pull request #2978 from corda/CORDA-1352/aslemmer-os-killflow 
CORDA-1352: Add killFlow
 2018-05-15 15:49:27 +01:00
Chris Rankin
fafd8406fd Merge commit 'd0d07287' into chrisr3-os-merge 2018-05-15 13:22:34 +01:00
sollecitom
9a69a36904 Merge remote-tracking branch 'remotes/open/master' into merges/may-14-15-21 
# Conflicts:
#	.idea/compiler.xml
#	constants.properties
#	experimental/behave/src/main/kotlin/net/corda/behave/network/Network.kt
#	experimental/behave/src/main/kotlin/net/corda/behave/node/Distribution.kt
#	experimental/behave/src/test/kotlin/net/corda/behave/service/PostreSQLServiceTests.kt
#	node-api/src/main/kotlin/net/corda/nodeapi/internal/bridging/AMQPBridgeManager.kt
#	node-api/src/main/kotlin/net/corda/nodeapi/internal/persistence/CordaPersistence.kt
#	node-api/src/main/kotlin/net/corda/nodeapi/internal/persistence/HibernateConfiguration.kt
#	node-api/src/main/kotlin/net/corda/nodeapi/internal/protonwrapper/netty/AMQPChannelHandler.kt
#	node-api/src/main/kotlin/net/corda/nodeapi/internal/protonwrapper/netty/AMQPClient.kt
#	node/src/integration-test/kotlin/net/corda/node/AuthDBTests.kt
#	node/src/main/kotlin/net/corda/node/internal/AbstractNode.kt
#	node/src/main/kotlin/net/corda/node/internal/NodeStartup.kt
#	node/src/main/kotlin/net/corda/node/services/config/ConfigUtilities.kt
#	node/src/main/kotlin/net/corda/node/services/messaging/MessagingExecutor.kt
#	node/src/main/kotlin/net/corda/node/services/persistence/AbstractPartyToX500NameAsStringConverter.kt
#	node/src/main/kotlin/net/corda/node/services/persistence/DBTransactionMappingStorage.kt
#	node/src/main/kotlin/net/corda/node/utilities/AddOrRemove.kt
#	node/src/test/kotlin/net/corda/node/services/config/NodeConfigurationImplTest.kt
#	samples/attachment-demo/src/integration-test/kotlin/net/corda/attachmentdemo/AttachmentDemoTest.kt
#	samples/irs-demo/web/src/test/kotlin/net/corda/irs/web/IrsDemoWebApplicationTests.kt
#	samples/simm-valuation-demo/src/integration-test/kotlin/net/corda/vega/SimmValuationTest.kt
#	testing/node-driver/src/main/kotlin/net/corda/testing/driver/Driver.kt
#	testing/node-driver/src/main/kotlin/net/corda/testing/node/internal/InternalTestUtils.kt
#	testing/node-driver/src/main/kotlin/net/corda/testing/node/internal/RPCDriver.kt
#	testing/smoke-test-utils/src/main/kotlin/net/corda/smoketesting/NodeConfig.kt
#	webserver/src/integration-test/kotlin/net/corda/webserver/WebserverDriverTests.kt
 2018-05-14 15:56:43 +01:00
josecoll
9d822cdbe8
CORDA-861 Pagination failure with aggregate groupBy query (#3135) 
* Pagination relies on a recursive call to count total results, this sub-query should NOT perform pagination checks.

* Fix using defaulted parameter.

* Make internal method private.
 2018-05-14 15:34:21 +01:00
Michele Sollecito
d027b5b8f2
[CORDA-1472]: Crackdown on warnings. (#3136) 2018-05-14 21:15:52 +07:00
Tudor Malene
543491c7df
CORDA-1461 improve devMode (#3100) 
* CORDA-1461 improve devMode

* CORDA-1461 set devMode=true for driver

* CORDA-1461 fix tests and improve UI

* CORDA-1461 Address code review changes

* CORDA-1461 Missing developer emoji

* CORDA-1461 use latest cordform that sets devMode=true

* CORDA-1461 fix test and add driver overrides for notary

* CORDA-1461 fix tests, fix api-scanner version

* CORDA-1461 fix api

* CORDA-1461 formatting

* CORDA-1461 comment style
 2018-05-11 17:48:02 +01:00
Mike Hearn
ce7ba2182b Merge remote-tracking branch 'open/master' into mike-merge-ea81548d6 2018-05-11 16:41:39 +02:00
Mike Hearn
af802bd8c5 Minor: fix a warning in VaultQueryTests 2018-05-11 13:02:40 +02:00
Mike Hearn
54e1a7aa7e Docs: fix some broken markup that caused rendering errors and warnings. 2018-05-11 13:02:40 +02:00
Viktor Kolomeyko
e7c2a0ca88
Merge pull request #825 from corda/feature/vkolomeyko/os-merge 
OS->Ent merge
 2018-05-11 10:35:46 +01:00
Michele Sollecito
590f626433
[ENT-1731]: Record an event of loading and unloading CorDapps. (#818) 2018-05-10 22:01:43 +07:00
Michele Sollecito
5e0b27cfae
[CORDA-1445]: Raise proper error when starting node in devMode with compatibilityZoneURL. (#3109) 2018-05-10 22:00:47 +07:00
Viktor Kolomeyko
355c65ad62 Merge remote-tracking branch 'remotes/open/master' into feature/vkolomeyko/os-merge 
# Conflicts:
#	node-api/src/main/kotlin/net/corda/nodeapi/internal/serialization/SharedContexts.kt
#	node/src/integration-test/kotlin/net/corda/node/services/RaftNotaryServiceTests.kt
#	tools/explorer/src/main/kotlin/net/corda/explorer/views/SearchField.kt
#	tools/explorer/src/main/kotlin/net/corda/explorer/views/TransactionViewer.kt
 2018-05-10 15:36:07 +01:00
Thomas Schroeter
1a6922afe0
Test notarisation of issue transactions with time-window (#3092) 2018-05-10 11:37:57 +01:00
Chris Rankin
8d6c54e2d5 Merge commit '781b50642aec9deeeadee219318509e050f9026e' into chrisr3-os-merge 2018-05-09 13:50:46 +01:00
Patrick Kuo
be11da76c8
CORDA-1363 Network registration helper should check public key in certificate before storing in keystore (#3071) 
* check pub key in network registration helper before storing in DB
 2018-05-09 12:56:10 +01:00
Katelyn Baker
96ab22f1da Merge remote-tracking branch 'open/master' into kat-merge-20180508 2018-05-09 11:00:07 +01:00
Michele Sollecito
d7ef385cc7
[CORDA-1395] [CORDA-1378]: Control the max number of transaction dependencies. (#3047) 2018-05-09 15:58:18 +07:00
sollecitom
c0e7e5cff4 Fixed tests broken by incorrect package name. 2018-05-08 15:48:59 +01:00
Maksymilian Pawlak
91f013c127
Flow framework test optimisation (#3031) 
* Flow framework test separation into classes, so the one which do not require nodes restart can execute faster.
 2018-05-08 14:00:57 +01:00
Maksymilian Pawlak
2a247cd229 Refactoring of VaultQuery tests to accomodate changes from OS 2018-05-08 12:54:25 +01:00
Katelyn Baker
406cdf39bb Merge remote-tracking branch 'open/master' into kat-merge-20180508 2018-05-08 12:10:22 +01:00
Michele Sollecito
b5e8dc5bd1
[CORDA-1338]: Error with VaultQuery for entity inheriting from CommonSchemaV1.FungibleState - FIX (#3025) 2018-05-04 22:37:56 +07:00
Anthony Keenan
100f680042
CORDA-1001 - Remove peristent map in NodeSchedulerService (#763) (#3076) 
* CORDA-1001 - Remove peristent map in NodeSchedulerService (#763)

* Add scheduled flow test that uses multithreaded node

* Replace use of PersistentMap in NodeSchedulerService

* Correct class name and remove duplicate test

* Address initial PR comments

* Remove debugging code

* Remove acidentally added line

* Move Scheduled State contracts to internal module

* Put things in the right places

* Add changelog message

* Fix countdown issue

* Addressing PR comments

* Remove unused class
 2018-05-04 15:04:52 +01:00
Katarzyna Streich
e564303869
CORDA-1414: node should continue with parameters from file when network map not available (#3061) 
Fix CORDA-1414

If network map is not available or returns exception on network
parameters reading, node should continue with parameters from file.
 2018-05-04 14:42:10 +01:00
Anthony Keenan
f8a4368310
Add node scheduler db tests inside use block (#3075) 2018-05-04 13:03:02 +01:00
Anthony Keenan
081b7251a7
CORDA-1001 - Remove peristent map in NodeSchedulerService (#763) 
* Add scheduled flow test that uses multithreaded node

* Replace use of PersistentMap in NodeSchedulerService

* Correct class name and remove duplicate test

* Address initial PR comments

* Remove debugging code

* Remove acidentally added line

* Move Scheduled State contracts to internal module

* Put things in the right places

* Add changelog message

* Fix countdown issue

* Addressing PR comments
 2018-05-04 11:35:01 +01:00
Maksymilian Pawlak
2cec6b095c
Vault query refactor (#3065) 
* Move test initialization logic to jUnit rules for better composition and reusability
 2018-05-04 10:21:40 +01:00
Andrius Dagys
855f89b61e Merge remote-tracking branch 'open/master' into andrius/os-merge 2018-05-03 13:37:39 +01:00
Shams Asari
9ffb43f3f7
CORDA-1385: Ignore duplicate packages and sub-packages in driver extraCordappPackagesToScan (#3066) 
Otherwise duplicate test CorDapps are loaded into the node
 2018-05-03 12:28:36 +01:00
Chris Rankin
a6b7257491
CORDA-1441: Upgrade to Kotlin 1.2.41 (#3063) 2018-05-03 12:12:54 +01:00
Michal Kit
e5e98f3540 Merge OS commit 'ab80df342ab8a7ede0539daaee9fcecd02f6aeeb' into enterprise 2018-05-03 10:55:40 +01:00
szymonsztuka
23c604b1db
Vault queries - change SQL generation for aggregate function in 'group by' clause. (#3016) 
Vault queries: 'order by' function aggregation e.g. 'order by sum(col)' is replaced by the position of the selected column (e.g. 'order by 1'). 
Rationale: A database may be unable to support aggregation function in order by clause e.g. 'order by (sum col_x)' and Hibernate can't produce alias in this case e.g. ' select sum(col_x) as alias_x... order by also_x ...', the best universal solution is to use positional parameter e.g. 'select sum(col_x) as alias_x... order by 1 ...'

(cherry picked from commit 416d4ec)
 2018-05-02 16:59:13 +01:00
szymonsztuka
81905ac400
Merge OS -> ENT up to c3e6b39 (including) pull request #796 2018-05-02 15:57:28 +01:00
Patrick Kuo
bb76c5bcde
Merge pull request #3054 from corda/pat/registration-tool-bugfix 
Bug fix: registration tool doesn't register for service identity if keystore already contains node cert
 2018-05-02 13:50:58 +01:00
Andrius Dagys
3bf1e803d9
Move notary service related classes and interfaces in core to interna… (#2827) 
* Move notary service related classes and interfaces in core to internal, since we won't be able to stabilise the APIs for writing custom notary services any time soon (the docs already mention it). I left out the wire protocol related classes so we don't accidentally break it.
 2018-05-02 12:21:38 +01:00
Patrick Kuo
2750017b8e Bug fix: registration tool doesn't register for service identity if keystore already contains node cert (#756) 
* fix a bug where registration tool will refuse to register for a service identity if the keystore contain NODE_CA key already.
some refactoring

(cherry picked from commit 5ed60ab)
 2018-05-02 09:59:12 +01:00
Patrick Kuo
5ed60ab60d
Bug fix: registration tool doesn't register for service identity if keystore already contains node cert (#756) 
* fix a bug where registration tool will refuse to register for a service identity if the keystore contain NODE_CA key already.
some refactoring
 2018-05-02 09:54:28 +01:00
szymonsztuka
b25892e45b resolved conflicts 2018-05-01 21:32:11 +01:00
Maksymilian Pawlak
29615f512e Close DB after test 
Add unique node prefix to DB source
 2018-05-01 14:37:35 +01:00
Maksymilian Pawlak
597a15a230 Compilation fix 
Daily DB integration test ignore, to release merge lock and allow for proper refactor
 2018-05-01 12:33:13 +01:00
Maksymilian Pawlak
bc77492d45 Compilation fix 2018-05-01 10:48:56 +01:00
Shams Asari
42edf58b92
Introducing AbstractArgsParser which removes the boilerplate of printing help and exiting the process on cmd line errors. (#3040) 2018-04-30 22:22:51 +01:00
Maksymilian Pawlak
b6e610252f Merge commit 'b210f7ab0ba141a6a02e445741dcdab6f9c5b303' into os-merge-30-04 
# Conflicts:
#	node/src/test/kotlin/net/corda/node/services/vault/VaultQueryTests.kt
 2018-04-30 18:22:33 +01:00
szymonsztuka
416d4ecaeb
ENT-1428 Vault queries - change SQL generation for aggregate function in 'group by' clause. (#426) 
Vault queries: 'order by' function aggregation e.g. 'order by sum(col)' is replaced by the position of the selected column (e.g. 'order by 1').
Rationale: NonStop database doesn't support aggregation function in order by clause e.g. 'order by (sum col_x)'. I couldn't find a way to force Hibernate to produce alias e.g. ' select sum(col_x) as alias_x... order by also_x ...',   and the only solution supported by all db an HPE NonStop is to use positional parameter e.g. 'select sum(col_x) as alias_x... order by 1 ...'
 2018-04-30 09:45:15 +01:00
Michal Kit
ab80df342a
CORDA-1319 Adding CRL checking for nodes (#2987) 
* Adding CRL support for nodes

* Addressing review comments
 2018-04-30 09:26:26 +01:00