ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-02-19 17:08:05 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity
12,028 Commits 96 Branches 407 Tags
Commit Graph

2255 Commits

Author SHA1 Message Date
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
bpaunescu
99d70fc197
Merge pull request #821 from corda/bogdan-merge-10-05-18 
Bogdan os-ent merge 10 05 18
 2018-05-10 11:52:27 +01:00
Thomas Schroeter
1a6922afe0
Test notarisation of issue transactions with time-window (#3092) 2018-05-10 11:37:57 +01:00
cburlinchon
1c2d6d8100
Unrevert artemis upgrade to 2.5.0 (#3029) (#815) 
* Revert "Revert "artemis upgrade to 2.5.0 (#3029)""
 2018-05-10 10:01:37 +01:00
bpaunescu
b4a402de36 Merge remote-tracking branch 'open/master' into bogdan-merge-10-05-18 2018-05-10 09:47:54 +01:00
bpaunescu
8419b24d80
CORDA-1443: re-wrote tests to ensure connection closes before node to avoid lengthy artemis timeouts (#3104) 2018-05-10 09:42:48 +01:00
Chris Rankin
8d6c54e2d5 Merge commit '781b50642aec9deeeadee219318509e050f9026e' into chrisr3-os-merge 2018-05-09 13:50:46 +01:00
Thomas Schroeter
750e368283
[ENT-1859] Handle issue transactions with time window (#809) 2018-05-09 13:12:33 +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
8517f51d49
Merge pull request #810 from corda/kat-merge-20180508 
Kat merge 20180508
 2018-05-09 12:09:33 +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
szymonsztuka
a792a2c13f
Add db schema setup in database mode for the integration test introduced by CORDA-1001. (#811) 2018-05-08 17:19:25 +01: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
Michele Sollecito
5318c395ee
[CORDA-860]: Retrieving state by recordTime.max() throws a cast exception (fixed) (#3090) 2018-05-08 19:16:19 +07: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
Andrius Dagys
e2ae04b11c
ENT-1410: MySQL notary service - process requests in batches (#758) 
* ENT-1410: MySQL notary service - process requests in batches
 2018-05-04 18:36:07 +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
Mike Hearn
0784f079ed Revert "OS merge (#806)" 
This reverts commit 5c0775f7b41561792c2590f6abee4e2d95e430dc.
 2018-05-04 16:09:11 +01:00
cburlinchon
5c0775f7b4
OS merge (#806) 2018-05-04 15:47:36 +01: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
cburlinchon
fe87f16d98
Register crypto providers after we init logging (#3067) 
* Register crypto providers after we init logging
 2018-05-03 16:24:54 +01:00
Andrius Dagys
524ba27721 Fix merge issues 2018-05-03 13:52:11 +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
Katelyn Baker
0d3c7e7762
CORDA-847 - RPC Server lib refactoring (#3056) 
Just as we did for the RPC CLient, refactor kryo specific elements into
their own sub module. Also move kryo specific components out of generic
RPC files.

Thus, adding AMQP support will be a much smoother operation
 2018-05-02 15:48:41 +01:00
Viktor Kolomeyko
884928c956
CORDA-1416: Upgrade version of Proton-J library (#3050) 
* CORDA-1416: Upgrade version of Proton-J library

* CORDA-1416: Compilation fixes following Proton-J upgrade

Reflects:
https://issues.apache.org/jira/browse/PROTON-1712
and
https://issues.apache.org/jira/browse/PROTON-1672

* CORDA-1416: Add an integration test to prove that data saved by from previous version can be read.

* CORDA-1416: Add additional check validate serialized form.
 2018-05-02 15:14:45 +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
szymonsztuka
37b715c955 Revert "artemis upgrade to 2.5.0 (#3029)" 
This reverts commit c3e6b39
 2018-05-02 13:47:19 +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
b19dac02c4 remove temporary code, reorder lines 2018-05-02 00:11:18 +01:00
szymonsztuka
1a616b1063 resolve merge conflicts - compilation error, fix integration tests in remote database mode 2018-05-01 23:48:13 +01:00
szymonsztuka
b25892e45b resolved conflicts 2018-05-01 21:32:11 +01:00
Katelyn Baker
e338414cd4
CORDA-847 - RPC Clent lib refactoring (#3052) 
Move Kryo into it's own sub module
 2018-05-01 20:52:19 +01:00
Maksymilian Pawlak
29615f512e Close DB after test 
Add unique node prefix to DB source
 2018-05-01 14:37:35 +01:00
Michele Sollecito
92922b874c
[CORDA-1397]: Fixed incorrect exception handling in NodeVaultService._query(). (#3043) 2018-05-01 19:33:13 +07:00
Konstantinos Chalkias
5bbfde3d35
Run filterMyKeys only when required (in NodeVaultService) (#3014) 2018-05-01 13:24:06 +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