ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2024-12-28 08:48:57 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity
10,757 Commits 91 Branches 405 Tags 354 MiB
1ecf646f7e
Commit Graph

10757 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
szymonsztuka
98a12c92d5
Fix database integration tests after OS->Ent merge (#295) 
* Add more db schemas to NodeRegistrationTest
* Add tables to drop
 2018-01-08 11:14:57 +00:00
Katelyn Baker
83a0a2fa3c
Enum evolution documentation (#2189) 
* CORDA-553 - Documentation

* CORDA-553 - Documentation

* Review comments

* review comments

* DOCUMENTATION: Serilization docs review updates
 2018-01-05 19:30:17 +00:00
Katelyn Baker
6a07576c96
CORDA-834 - Class default evolution serialisation documentation (#2209) 
CORDA-834 - Class default evolution serialisation documentation
 2018-01-05 17:44:53 +00:00
Katelyn Baker
e2286a75e5
CORDA-902 - Serialization documentation (#2323) 
CORDA-902 - Serialization documentation
 2018-01-05 17:34:32 +00:00
Shams Asari
dad207ef7d
Merge pull request #292 from corda/shams-os-merge-040118 
Shams os merge 040118
 2018-01-05 17:13:17 +00:00
Katelyn Baker
37e0830b7d
Merge pull request #2317 from corda/kat/feature/setterConstructAMQP 
CORDA-902 - AMQP Setter Construction when empty / no constructor
 2018-01-05 16:37:23 +00:00
Andrzej Cichocki
9d66214f4a
CORDA-891 Convert NodeSchedulerServiceTest into a unit test (#2273) 2018-01-05 16:34:03 +00:00
Katelyn Baker
3bf84ebbd4 Review Comments 2018-01-05 15:50:24 +00:00
Katelyn Baker
f230e2670b REVIEW COMMENTS 2018-01-05 15:50:24 +00:00
Katelyn Baker
f4ad8d3e70 CORDA-902 - AMQP Setter Construction when empty / no constructor 2018-01-05 15:50:24 +00:00
Katelyn Baker
7856eb158c
Merge pull request #2327 from corda/REMOVE_FLAKEY_TESTS 
REMOVING FLAKEY TESTS TILL THEYRE STABILISED
 2018-01-05 15:49:23 +00:00
Shams Asari
52e42ce22f Merge remote-tracking branch 'origin/master' into shams-os-merge-040118 2018-01-05 15:20:19 +00:00
Michal Kit
a83f4fd61b
Changing network parameters to use node info files instead of by hand… (#288) 
* Changing network parameters to use node info files instead of by hand specification of notary

* Addressing review comments

* Different names for notaries

* Updating README
 2018-01-05 15:10:34 +00:00
Katelyn Baker
ab76ef4deb REMOVING FLAKEY TESTS TILL THEYRE STABILISED 2018-01-05 15:05:10 +00:00
Shams Asari
2cb71ff649 Merge fixes 2018-01-05 14:38:53 +00:00
Shams Asari
3b0694af24 Merge branch 'master' into shams-os-merge-040118 2018-01-05 14:16:54 +00:00
Shams Asari
74c2eb8a0a Merge remote-tracking branch 'open/master' into shams-os-merge-040118 
# Conflicts:
#	node/src/integration-test/kotlin/net/corda/node/AuthDBTests.kt
#	node/src/integration-test/kotlin/net/corda/node/SSHServerTest.kt
 2018-01-05 14:13:36 +00:00
Katelyn Baker
694721e8ba TEMP removal of SSH tests till they're made determinsitic (#2325) 2018-01-05 14:07:55 +00:00
Tommy Lillehagen
a639839a68
ENT-1188 - Clean-up dependencies (SGX) (#166) 
* ENT-1188 - Remove unused scripts and dependencies

* ENT-1188 - Update references to removed scripts

* ENT-1188 - Clean up Makefile for container build of SGX JVM

* ENT-1188 - Group udev rules into separate folder

* ENT-1188 - Remove old references to dependencies folder
 2018-01-05 12:03:29 +00:00
igor nitto
00b570df29
Improve RPC security test coverage [CORDA-827] (#2320) 
* Added test cases covering encrypted password usage
 * Renamed UserAuthServiceTests as AuthDBTests: the integration tests checking user credentials loaded from external database (still limited to H2 in-memory for now).
 * Some internal renamings
 2018-01-05 11:50:21 +00:00
Shams Asari
cc6113ff06 Merge remote-tracking branch 'open/master' into shams-os-merge-040118 
# Conflicts:
#	gradle-plugins/cordformation/src/main/kotlin/net/corda/plugins/Node.kt
 2018-01-05 10:09:12 +00:00
Anthony Keenan
1661cea816
CORDA-892: Make cordform test use new network bootstrapper logic (#2307) 
* Make cordform test use new network bootstrapper logic

* Fixing review comments

* Fix issue with backwards compatibility

* Fix issue with setup not being called from CordformDefinitions

* Make sure node dir is created (as CordformDefinition uses it directly if setup is overridden
Make sure tmp dir is created

* Don't crash if node dir is already created

* Stop overwriting errors
 2018-01-05 09:21:59 +00:00
Shams Asari
1e9e1a61d9 Moved IntegrationTest class into internal package 2018-01-04 22:08:16 +00:00
Shams Asari
b577b680ff Merge remote-tracking branch 'open/master' into shams-os-merge-040118 2018-01-04 18:32:15 +00:00
Shams Asari
133fd27222 Merge fixes and updated network-management to work with the move away from X509CertificateHolder 2018-01-04 18:30:21 +00:00
Chris Rankin
00a02b30fe
Update link for Corda API strategy documentation. (#2316) 2018-01-04 18:05:06 +00:00
Konstantinos Chalkias
48be562a2a
ECDSA entropyToKeyPair + no idempotent signatures (#2210) 2018-01-04 17:52:31 +00:00
Katelyn Baker
259eef8838
Merge pull request #2314 from corda/spellerrorfix 
SPELLING ERROR FIX - It's -> Its
 2018-01-04 16:46:29 +00:00
Katelyn Baker
01e4880947 SPELLING: updae error message in tests 2018-01-04 15:49:55 +00:00
Joel Dudley
63734aa3ed
Harmonises the names of the parameters across CashExitFlow constructors. 2018-01-04 13:35:56 +00:00
Ross Nicoll
412fead02e
CORDA-785: Add functions for constructing FlowLogicRef without the class (#2134) 
Add functions for constructing `FlowLogicRef` from class name, rather than requiring the class itself. This avoids requiring that schedulable states have access to the scheduled flow to instantiate, but instead can require it only actually scheduling the flow. This reduces the size of the JAR required to validate transactions containing these states.
 2018-01-04 13:32:10 +00:00
Shams Asari
13619df0b1 Merge remote-tracking branch 'open/master' into shams-os-merge-040118 
# Conflicts:
#	node/src/integration-test/kotlin/net/corda/node/utilities/registration/NodeRegistrationTest.kt
#	testing/node-driver/src/main/kotlin/net/corda/testing/node/MockServices.kt
#	testing/test-utils/src/main/kotlin/net/corda/testing/dsl/TransactionDSLInterpreter.kt
 2018-01-04 10:58:44 +00:00
Andrzej Cichocki
8a3299fa2a
CORDA-716 Configure api scanner for test modules (#2259) 2018-01-04 10:09:04 +00:00
Katelyn Baker
6d485a3329 SPELLING ERROR FIX 2018-01-04 10:03:04 +00:00
Shams Asari
d84105b60e
Using X509Certificate consistently throughout, rather than BC's X509CertificateHolder. (#2305) 
The later is now only used where needed. This has reduced the amount of converting we have to do back and forth.
 2018-01-03 22:00:39 +00:00
Katelyn Baker
266493c4f5
Merge pull request #2312 from corda/kat/feature/betterPrivateMemberErrMsg 
CORDA-882 - Better err messages when serializer encounters private property
 2018-01-03 21:04:46 +00:00
Tommy Lillehagen
131f2795fb
Merge pull request #2311 from corda/tlil/CORDA-878/update-irs-demo-instructions 
CORDA-878 - Update IRS demo instructions
 2018-01-03 18:38:58 +00:00
Katelyn Baker
fb71a45be5 CORDA-882 - Better err messages when serializer encounters private property 2018-01-03 18:27:14 +00:00
Tudor Malene
b8fa95b3d1
[ENT-1145]: change name of foreign keys to a human-readable format of FK__from_table__to_table (#275) 2018-01-03 15:35:31 +00:00
Tommy Lillehagen
dd329c860c CORDA-878 - Update IRS demo instructions 2018-01-03 14:19:03 +00:00
Michal Kit
e9c2090832
Fixing the HSM service config overriding issue (#274) 
* Fixing the HSM service config overriding issue

* Addressing review comments
 2018-01-03 11:26:45 +00:00
Shams Asari
62dbf3651d
Merge pull request #277 from corda/shams-os-merge-020118 
Shams os merge 020118
 2018-01-03 10:46:13 +00:00
Joel Dudley
c1874cbd62
Fixes a broken link to the shell page. 2018-01-03 10:00:33 +00:00
Maksymilian Pawlak
5c85e80b17 Restoring apparently missing SIMM demo documentation (#2293) 
(cherry picked from commit 2e84bad)
 2018-01-02 16:48:08 +00:00
Shams Asari
022daf2190 Merge and test fixes 2018-01-02 16:39:52 +00:00
Shams Asari
20683c3239
Added checks on the received node CA cert from the doorman service. (#2301) 2018-01-02 15:51:13 +00:00
Shams Asari
52173219c3 Merge remote-tracking branch 'open/master' into shams-os-merge-020118 
# Conflicts:
#	client/rpc/src/integration-test/java/net/corda/client/rpc/CordaRPCJavaClientTest.java
#	node/src/integration-test/kotlin/net/corda/node/NodeKeystoreCheckTest.kt
#	node/src/integration-test/kotlin/net/corda/node/services/network/NetworkMapTest.kt
#	node/src/integration-test/kotlin/net/corda/node/utilities/registration/NodeRegistrationTest.kt
#	node/src/integration-test/kotlin/net/corda/services/messaging/MQSecurityTest.kt
#	node/src/main/kotlin/net/corda/node/services/config/ConfigUtilities.kt
#	node/src/test/kotlin/net/corda/node/services/events/NodeSchedulerServiceTest.kt
#	testing/node-driver/src/main/kotlin/net/corda/testing/node/internal/DriverDSLImpl.kt
 2018-01-02 15:32:32 +00:00
bpaunescu
80640cca91 replaces uses of java.Date with java.time; 
changed nullable timestamp variables to non-nullable
 2018-01-02 15:22:03 +00:00
Shams Asari
730fec2eb4
Internal driver now also does the registration for the notaries. (#2304) 
Using the --just-generate-node-info flag for the notary nodes so that their identities can be submitted to the network map server, which does the network parameters generation.
 2018-01-02 15:12:30 +00:00
szymonsztuka
7d71fa338a
Merge pull request #270 from corda/feature/test-merge-szymon 
Test merge single commit from OS
 2018-01-02 14:46:26 +01:00