Commit Graph

270 Commits

Author SHA1 Message Date
Andras Slemmer
4f85026dfc Merge remote-tracking branch 'open/master' 2017-06-27 14:45:30 +01:00
Chris Rankin
92c238b2aa Alter logging patterns to a more explicit form. (#918) 2017-06-26 13:24:24 +01:00
Chris Rankin
433a9ab5c3 DemoBench operates exclusively on localhost, so no need for public IP. (#919) 2017-06-26 10:12:48 +01:00
Mike Hearn
ca8f5050cf Merge branch 'master' into mike-enterprise-merge-june-20th 2017-06-21 19:49:33 +02:00
Katarzyna Streich
c22614ae86 Reduce diffs. 2017-06-21 19:25:51 +02:00
Ross Nicoll
19ff72a411 Correct ISO country code in names 2017-06-21 14:04:22 +01:00
Katarzyna Streich
ab1b7eb551 Move all changes unrelated to flow view in explorer to open source. 2017-06-20 18:01:49 +02:00
Patrick Kuo
66421692a3 pass consoleLogLevel parameter to load test to enable log to console (#866) 2017-06-20 10:52:47 +01:00
Katarzyna Streich
20403d806a Cleanup of the explorer code related to internal flow view work. (#832)
Cleanup of the explorer code related to internal flow view work.
Changes in simulation, widgets, minor visual.
2017-06-20 10:45:42 +01:00
Katarzyna Streich
70ef5e1676 Reduce diffs between open source and enterprise repos in Network view in explorer. 2017-06-19 17:22:19 +01:00
Patrick Kuo
28afb6d3ff Added throttling to the load test tool and added stability test. (#847)
* Added throttling to the load test tool.
* Added stability test to the tool.
* Some refactoring to allow some configuration via vm option.
* updated doc.
* gradle now passes system parameter to load test.
* using Guava's RateLimiter instead of execute at fix rate.
2017-06-16 15:30:11 +01:00
Shams Asari
b52d3706eb Moved Driver.kt to net.corda.testing.driver in the test-utils module 2017-06-14 15:12:39 +01:00
Chris Rankin
97053be4f7 Build capsules using runtime dependencies instead of compile ones. (#842)
This restores `artemis-amqp-protocol` to Corda Node.
2017-06-14 15:10:59 +01:00
Katarzyna Streich
5e1e50071d Flow triage view now is ordered by stateMachines observation arrival.
Fix bug onUndock when there is no transactions in transactions view.
2017-06-13 18:19:05 +01:00
Katarzyna Streich
556eb756a8 Yet another commit with PR comments addressed. 2017-06-12 17:37:40 +01:00
Katarzyna Streich
1d18917773 Address PR comments, change sizing and improve filtering. 2017-06-12 17:37:39 +01:00
Katarzyna Streich
4f00bad908 Address PR comments. Add links from FlowTriage view to Network and to TransactionView with showing
relevant transactions/peers on the map.
2017-06-12 17:37:39 +01:00
Katarzyna Streich
67a417389b Add counting of different flows to the widget. Change widget styling, add some icons. 2017-06-12 17:37:39 +01:00
Katarzyna Streich
775c26c573 Address PR comments. 2017-06-12 17:37:39 +01:00
Katarzyna Streich
608550c920 Change tabs to search field in state machine view. Some carving of UI. 2017-06-12 17:37:39 +01:00
Katarzyna Streich
e402f4d5af Add simulation with broken flows. Refactor of simulation code. 2017-06-12 17:37:39 +01:00
Katarzyna Streich
ab0bc8b8d0 Make flow initiator view code more generic. 2017-06-12 17:37:39 +01:00
Katarzyna Streich
c734f625ad Add StateMachineViewer and data model to explorer.
Add state machine details with flow result or error, flow initiator, flow name and progress.
Split flows into categories: in progress, errored, done.
2017-06-12 17:37:39 +01:00
Richard Green
70e7a94310 Interim checkin 2017-06-12 17:37:38 +01:00
Chris Rankin
d3de125166 Update documentation for DemoBench's MacOSX signing key. (#826) 2017-06-12 12:50:22 +01:00
Patrick Kuo
58114f817c A better looking scrollbar css for corda explorer (#802) 2017-06-08 16:54:54 +01:00
FredericDalibard
d76c23824e Add EUR to the cash app and demobench tool. Authored by Frederic Dalibard. 2017-06-08 16:33:49 +02:00
Katarzyna Streich
73e5eddb13 Fix wrong layout of new added nodes to map view in explorer. (#794)
* Fix wrong layout of new added nodes to map view in explorer. Fix double rendering of myIdentity label.

* Make buttons in map view take the whole available space.

* Remove party full name from network map view in explorer.
2017-06-07 13:28:29 +01:00
Mike Hearn
f4321affad DemoBench: enable emoji in the terminal when built with a JetBrains JRE. 2017-06-06 14:55:09 +02:00
Chris Rankin
db9cc3a460 Upgrade DemoBench to purejavacomm 0.0.18 (#791) 2017-06-05 15:31:33 +01:00
Katarzyna Streich
39fdb353ad Remove nearestCity from node configuration. (#721)
* Fix bug in demobench. Explorer didn't show correctly location of a node.
There was no nearestCity override in config.

* Remove nearestCity from node configuration. Now information about the location is always taken from
node's legal name. If not present - exception on node startup.

* Add X500Name.locationOrNull that soft fails when location is not in X500 name. Address PR comments.

* Remove unused imports.
2017-05-31 16:07:13 +01:00
Ross Nicoll
34eb5a3b70 Store certificate and path with well known identity (#726)
* Construct standard flows using PartyAndCertificate, and add support for launching
flows that are constructed with PartyAndCertificate or just Party.
* Store PartyAndCertificate in network map service
* Expand identity service to store certificates along with all identities.
2017-05-31 14:45:58 +01:00
Shams Asari
329e5ff17b Introducing InitiatedBy annotation to be used on initiated flows to simplify flow registration.
This removes the need to do manual registration using the PluginServiceHub. As a result CordaPluginRegistry.servicePlugins is no longer needed. For oracles and services there is a CorDappService annotation.

I've also fixed the InitiatingFlow annotation such that client flows can be customised (sub-typed) without it breaking the flow sessions.
2017-05-31 10:50:16 +01:00
Chris Rankin
e117ab7703 Allow DemoBench to install Explorer's CorDapps multiple times. (#761) 2017-05-31 10:31:10 +01:00
Chris Rankin
bcf4c4a2bb Document how we should test DemoBench. (#742) 2017-05-25 15:24:18 +01:00
Chris Rankin
35ee60f12b Require user R3CEV for DemoBench DMG signing key. (#737) 2017-05-25 14:12:58 +01:00
Chris Rankin
1aae41214f Unpack DemoBench's capsules within $HOME/demobench directory. (#738)
* Unpack the capsules into a subdirectory of $HOME/demobench.
* Minor tidy up.
* Add a new suggested bank.
2017-05-25 11:49:21 +01:00
Andrius Dagys
376a9d399f Merge remote-tracking branch 'open/master' 2017-05-24 12:19:49 +01:00
Chris Rankin
375392d32d Compile caplets against correct version of capsule. (#732) 2017-05-24 09:58:33 +01:00
Chris Rankin
179eccdd20 Modify how Gradle creates capsules: (#730)
- Better Gradle dependency management.
- Remove empty module jars from the capsules.
2017-05-23 18:04:20 +01:00
Chris Rankin
975866590b Prevent DemoBench hanging on shutdown (#722)
* We need to close the RPC client as otherwise the rpc-client-reaper-* thread is leaked, which also prevents shutdown. Sleep instead when the server exits, just long enough for the client to realise that the server is dead.
* Fix warning about leaking private types.
2017-05-22 12:18:53 +01:00
Mike Hearn
7244f2eeea Temp hack to fix DemoBench in master: leak the RPC connections when a node shuts down to avoid a hang. 2017-05-19 16:45:22 +02:00
Chris Rankin
5cf304e8c4 Disable the DemoBench tab if the node exits abnormally. (#692)
* Log a message when the CRaSH shell exits.
* Disable the DemoBench tab if the node exits abnormally.
2017-05-17 00:19:48 +01:00
Ross Nicoll
c13a99a2f9 Replaces keys and parties in states with AbstractParty
Switch to using AbstractParty as the standard identifier for parties in
states, so that full parties can be used during construction of
transactions and anonymised parties when the transaction is being added
to the ledger.
2017-05-16 12:07:14 +01:00
Andrzej Cichocki
d3bb040355 Refactoring related to BFT notary demo (#680)
* Fix: Add missing @StartableByRPC to fix the Raft notary demo
* Make loadConfig take a Config object, for cordformation Node
* Unduplicate User.toMap
* Unduplicate WHITESPACE regex, choose possessive form
* Use slash to make a Path
* Remove Companion where redundant
* Remove unused code
2017-05-16 11:30:50 +01:00
Chris Rankin
6bc885fb09 Create X.500 names for DemoBench nodes. (#674) 2017-05-12 12:15:17 +01:00
Shams Asari
48f58b6dbc Introducing StartableByRPC and SchedulableFlow annotations, needed by flows started via RPC and schedulable flows respectively.
CordaPluginRegistry.requiredFlows is no longer needed as a result.
2017-05-11 14:55:40 +01:00
Andrius Dagys
dfb63231e3 Merge remote-tracking branch 'open/master' 2017-05-11 13:59:02 +01:00
Ross Nicoll
e4a0bc6e11 Move party classes into identity package
Move AbstractParty, AnonymousParty and Party into a new net.corda.core.identity package,
as they're not really cryptography tools, and in preparation for further code coming in
for identity.

Optimize imports on many files to clean up the resulting refactor.
2017-05-11 11:25:59 +01:00
Chris Rankin
9a5775698b Try to copy the CorDapp if we fail to create a symlink, e.g. on Win10. (#659) 2017-05-10 10:31:34 +01:00