From 4d335843b28ccf112bcb079a92c2fee74d0b5258 Mon Sep 17 00:00:00 2001
From: Christian Sailer <christian.sailer@r3.com>
Date: Tue, 6 Nov 2018 11:27:18 +0000
Subject: [PATCH] Remove blank line and formatting

---
 .idea/compiler.xml                            | 218 ++++++++++++++++++
 docs/source/upgrade-notes.rst                 |   1 -
 .../net/corda/node/services/TimedFlowTests.kt |   4 +-
 3 files changed, 219 insertions(+), 4 deletions(-)

diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index a926515bc2..9208ede561 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -4,15 +4,35 @@
     <bytecodeTargetLevel target="1.8">
       <module name="api-scanner_main" target="1.8" />
       <module name="api-scanner_test" target="1.8" />
+      <module name="attachment-demo_integrationTest" target="1.8" />
+      <module name="attachment-demo_main" target="1.8" />
+      <module name="attachment-demo_test" target="1.8" />
+      <module name="avalanche_main" target="1.8" />
+      <module name="avalanche_test" target="1.8" />
       <module name="bank-of-corda-demo_integrationTest" target="1.8" />
+      <module name="bank-of-corda-demo_main" target="1.8" />
+      <module name="bank-of-corda-demo_test" target="1.8" />
+      <module name="behave-tools_main" target="1.8" />
+      <module name="behave-tools_test" target="1.8" />
       <module name="behave_behave" target="1.8" />
       <module name="behave_main" target="1.8" />
       <module name="behave_scenario" target="1.8" />
       <module name="behave_test" target="1.8" />
       <module name="blobinspector_main" target="1.8" />
       <module name="blobinspector_test" target="1.8" />
+      <module name="bootstrapper_main" target="1.8" />
+      <module name="bootstrapper_test" target="1.8" />
+      <module name="bridge_integrationTest" target="1.8" />
+      <module name="bridge_main" target="1.8" />
+      <module name="bridge_test" target="1.8" />
+      <module name="bridgecapsule_main" target="1.6" />
+      <module name="bridgecapsule_smokeTest" target="1.6" />
+      <module name="bridgecapsule_test" target="1.6" />
       <module name="buildSrc_main" target="1.8" />
       <module name="buildSrc_test" target="1.8" />
+      <module name="business-network-demo_integrationTest" target="1.8" />
+      <module name="business-network-demo_main" target="1.8" />
+      <module name="business-network-demo_test" target="1.8" />
       <module name="canonicalizer_main" target="1.8" />
       <module name="canonicalizer_test" target="1.8" />
       <module name="capsule-crr-submission_main" target="1.8" />
@@ -23,13 +43,37 @@
       <module name="capsule-hsm-crl-generator_test" target="1.8" />
       <module name="capsule-hsm_main" target="1.8" />
       <module name="capsule-hsm_test" target="1.8" />
+      <module name="cli_main" target="1.8" />
+      <module name="cli_test" target="1.8" />
       <module name="client_main" target="1.8" />
       <module name="client_test" target="1.8" />
+      <module name="cliutils_main" target="1.8" />
+      <module name="cliutils_test" target="1.8" />
+      <module name="common-configuration-parsing_main" target="1.8" />
+      <module name="common-configuration-parsing_test" target="1.8" />
+      <module name="common-validation_main" target="1.8" />
+      <module name="common-validation_test" target="1.8" />
       <module name="common_main" target="1.8" />
       <module name="common_test" target="1.8" />
+      <module name="confidential-identities_main" target="1.8" />
+      <module name="confidential-identities_test" target="1.8" />
+      <module name="consensus-benchmark_main" target="1.8" />
+      <module name="consensus-benchmark_test" target="1.8" />
+      <module name="contract_main" target="1.8" />
+      <module name="contract_test" target="1.8" />
       <module name="contracts-states_integrationTest" target="1.8" />
+      <module name="contracts-states_main" target="1.8" />
+      <module name="contracts-states_test" target="1.8" />
       <module name="corda-core_integrationTest" target="1.8" />
       <module name="corda-core_smokeTest" target="1.8" />
+      <module name="corda-enterprise-client_main" target="1.8" />
+      <module name="corda-enterprise-client_test" target="1.8" />
+      <module name="corda-enterprise-testing_main" target="1.8" />
+      <module name="corda-enterprise-testing_test" target="1.8" />
+      <module name="corda-enterprise-tools_main" target="1.8" />
+      <module name="corda-enterprise-tools_test" target="1.8" />
+      <module name="corda-enterprise_main" target="1.8" />
+      <module name="corda-enterprise_test" target="1.8" />
       <module name="corda-finance_integrationTest" target="1.8" />
       <module name="corda-project-testing_main" target="1.8" />
       <module name="corda-project-testing_test" target="1.8" />
@@ -37,36 +81,126 @@
       <module name="corda-project-tools_test" target="1.8" />
       <module name="corda-project_main" target="1.8" />
       <module name="corda-project_test" target="1.8" />
+      <module name="corda-utils_integrationTest" target="1.8" />
+      <module name="corda-utils_main" target="1.8" />
+      <module name="corda-utils_test" target="1.8" />
       <module name="corda-webserver_integrationTest" target="1.8" />
       <module name="corda-webserver_main" target="1.8" />
       <module name="corda-webserver_test" target="1.8" />
+      <module name="cordapp-configuration_main" target="1.8" />
+      <module name="cordapp-configuration_test" target="1.8" />
       <module name="cordapp_integrationTest" target="1.8" />
       <module name="cordapp_main" target="1.8" />
       <module name="cordapp_test" target="1.8" />
+      <module name="cordform-common_main" target="1.8" />
+      <module name="cordform-common_test" target="1.8" />
       <module name="cordformation_main" target="1.8" />
       <module name="cordformation_runnodes" target="1.8" />
       <module name="cordformation_test" target="1.8" />
+      <module name="core-deterministic-testing_main" target="1.8" />
+      <module name="core-deterministic-testing_test" target="1.8" />
+      <module name="core-deterministic_main" target="1.8" />
+      <module name="core-deterministic_test" target="1.8" />
       <module name="core_extraResource" target="1.8" />
+      <module name="core_integrationTest" target="1.8" />
+      <module name="core_main" target="1.8" />
+      <module name="core_smokeTest" target="1.8" />
+      <module name="core_test" target="1.8" />
+      <module name="data_main" target="1.8" />
+      <module name="data_test" target="1.8" />
+      <module name="dbmigration_main" target="1.8" />
+      <module name="dbmigration_test" target="1.8" />
+      <module name="demobench_main" target="1.8" />
+      <module name="demobench_test" target="1.8" />
+      <module name="dist_binFiles" target="1.8" />
+      <module name="dist_installerFiles" target="1.8" />
       <module name="dist_licenseFiles" target="1.8" />
+      <module name="dist_main" target="1.8" />
+      <module name="dist_readmeFiles" target="1.8" />
       <module name="dist_startupScripts" target="1.8" />
+      <module name="dist_test" target="1.8" />
+      <module name="djvm_main" target="1.8" />
+      <module name="djvm_test" target="1.8" />
+      <module name="docs_main" target="1.8" />
       <module name="docs_source_example-code_integrationTest" target="1.8" />
       <module name="docs_source_example-code_main" target="1.8" />
       <module name="docs_source_example-code_test" target="1.8" />
+      <module name="docs_test" target="1.8" />
+      <module name="example-code_integrationTest" target="1.8" />
+      <module name="example-code_main" target="1.8" />
+      <module name="example-code_test" target="1.8" />
+      <module name="experimental-behave_behave" target="1.8" />
+      <module name="experimental-behave_main" target="1.8" />
+      <module name="experimental-behave_smokeTest" target="1.8" />
+      <module name="experimental-behave_test" target="1.8" />
       <module name="experimental-kryo-hook_main" target="1.8" />
       <module name="experimental-kryo-hook_test" target="1.8" />
+      <module name="experimental_main" target="1.8" />
       <module name="experimental_rpc-worker_main" target="1.8" />
       <module name="experimental_rpc-worker_test" target="1.8" />
+      <module name="experimental_test" target="1.8" />
+      <module name="explorer-capsule_main" target="1.6" />
+      <module name="explorer-capsule_test" target="1.6" />
+      <module name="explorer_main" target="1.8" />
+      <module name="explorer_test" target="1.8" />
+      <module name="finance_integrationTest" target="1.8" />
+      <module name="finance_main" target="1.8" />
+      <module name="finance_test" target="1.8" />
+      <module name="flow-hook_main" target="1.8" />
+      <module name="flow-hook_test" target="1.8" />
+      <module name="flow-worker_integrationTest" target="1.8" />
+      <module name="flow-worker_main" target="1.8" />
+      <module name="flow-worker_test" target="1.8" />
       <module name="flows_integrationTest" target="1.8" />
+      <module name="flows_main" target="1.8" />
+      <module name="flows_test" target="1.8" />
       <module name="gradle-plugins-cordapp_main" target="1.8" />
       <module name="gradle-plugins-cordapp_test" target="1.8" />
+      <module name="graphs_main" target="1.8" />
+      <module name="graphs_test" target="1.8" />
+      <module name="ha-testing_integrationTest" target="1.8" />
+      <module name="ha-testing_main" target="1.8" />
+      <module name="ha-testing_test" target="1.8" />
+      <module name="hsm-tool_main" target="1.8" />
+      <module name="hsm-tool_test" target="1.8" />
       <module name="intellij-plugin_main" target="1.8" />
       <module name="intellij-plugin_test" target="1.8" />
+      <module name="irs-demo-cordapp_integrationTest" target="1.8" />
+      <module name="irs-demo-cordapp_main" target="1.8" />
       <module name="irs-demo-cordapp_main~1" target="1.8" />
+      <module name="irs-demo-cordapp_test" target="1.8" />
       <module name="irs-demo-cordapp_test~1" target="1.8" />
       <module name="irs-demo-web_main" target="1.8" />
       <module name="irs-demo-web_test" target="1.8" />
+      <module name="irs-demo_integrationTest" target="1.8" />
+      <module name="irs-demo_main" target="1.8" />
+      <module name="irs-demo_systemTest" target="1.8" />
+      <module name="irs-demo_test" target="1.8" />
+      <module name="isolated_main" target="1.8" />
+      <module name="isolated_test" target="1.8" />
+      <module name="jackson_main" target="1.8" />
+      <module name="jackson_test" target="1.8" />
       <module name="jarfilter_main" target="1.8" />
       <module name="jarfilter_test" target="1.8" />
+      <module name="jdk8u-deterministic_main" target="1.8" />
+      <module name="jdk8u-deterministic_test" target="1.8" />
+      <module name="jfx_integrationTest" target="1.8" />
+      <module name="jfx_main" target="1.8" />
+      <module name="jfx_test" target="1.8" />
+      <module name="jmeter_main" target="1.8" />
+      <module name="jmeter_test" target="1.8" />
+      <module name="jpa_main" target="1.8" />
+      <module name="jpa_test" target="1.8" />
+      <module name="kryo-hook_main" target="1.8" />
+      <module name="kryo-hook_test" target="1.8" />
+      <module name="launcher_main" target="1.8" />
+      <module name="launcher_test" target="1.8" />
+      <module name="loadtest_main" target="1.8" />
+      <module name="loadtest_test" target="1.8" />
+      <module name="mock_main" target="1.8" />
+      <module name="mock_test" target="1.8" />
+      <module name="mysql_main" target="1.8" />
+      <module name="mysql_test" target="1.8" />
       <module name="net.corda-bank-of-corda-demo_integrationTest" target="1.8" />
       <module name="net.corda-corda-project_main" target="1.8" />
       <module name="net.corda-corda-project_test" target="1.8" />
@@ -78,27 +212,101 @@
       <module name="net.corda_buildSrc_test" target="1.8" />
       <module name="net.corda_canonicalizer_main" target="1.8" />
       <module name="net.corda_canonicalizer_test" target="1.8" />
+      <module name="network-bootstrapper_main" target="1.8" />
+      <module name="network-bootstrapper_test" target="1.8" />
+      <module name="network-verifier_main" target="1.8" />
+      <module name="network-verifier_test" target="1.8" />
       <module name="network-visualiser_main" target="1.8" />
       <module name="network-visualiser_test" target="1.8" />
+      <module name="node-api_main" target="1.8" />
+      <module name="node-api_test" target="1.8" />
+      <module name="node-capsule_main" target="1.6" />
+      <module name="node-capsule_test" target="1.6" />
+      <module name="node-driver_integrationTest" target="1.8" />
+      <module name="node-driver_main" target="1.8" />
+      <module name="node-driver_test" target="1.8" />
       <module name="node-schemas_main" target="1.8" />
       <module name="node-schemas_test" target="1.8" />
+      <module name="node_integrationTest" target="1.8" />
+      <module name="node_main" target="1.8" />
       <module name="node_smokeTest" target="1.8" />
+      <module name="node_test" target="1.8" />
+      <module name="notary-bft-smart_main" target="1.8" />
+      <module name="notary-bft-smart_test" target="1.8" />
+      <module name="notary-demo_main" target="1.8" />
+      <module name="notary-demo_test" target="1.8" />
+      <module name="notary-healthcheck-client_main" target="1.8" />
+      <module name="notary-healthcheck-client_test" target="1.8" />
+      <module name="notary-healthcheck-cordapp_integrationTest" target="1.8" />
+      <module name="notary-healthcheck-cordapp_main" target="1.8" />
+      <module name="notary-healthcheck-cordapp_test" target="1.8" />
+      <module name="notary-healthcheck_main" target="1.8" />
+      <module name="notary-healthcheck_test" target="1.8" />
+      <module name="notary-raft_main" target="1.8" />
+      <module name="notary-raft_test" target="1.8" />
+      <module name="notary_main" target="1.8" />
+      <module name="notary_test" target="1.8" />
+      <module name="notarytest_main" target="1.8" />
+      <module name="notarytest_test" target="1.8" />
+      <module name="perftestcordapp_integrationTest" target="1.8" />
+      <module name="perftestcordapp_main" target="1.8" />
+      <module name="perftestcordapp_test" target="1.8" />
       <module name="publish-utils_main" target="1.8" />
       <module name="publish-utils_test" target="1.8" />
+      <module name="qa-behave_main" target="1.8" />
+      <module name="qa-behave_test" target="1.8" />
+      <module name="qa_main" target="1.8" />
+      <module name="qa_test" target="1.8" />
+      <module name="quasar-hook_main" target="1.8" />
+      <module name="quasar-hook_test" target="1.8" />
       <module name="quasar-utils_main" target="1.8" />
       <module name="quasar-utils_test" target="1.8" />
       <module name="registration-tool_main" target="1.8" />
       <module name="registration-tool_test" target="1.8" />
+      <module name="rpc-proxy_main" target="1.8" />
+      <module name="rpc-proxy_rpcProxy" target="1.8" />
+      <module name="rpc-proxy_smokeTest" target="1.8" />
+      <module name="rpc-proxy_test" target="1.8" />
+      <module name="rpc-worker_integrationTest" target="1.8" />
+      <module name="rpc-worker_main" target="1.8" />
+      <module name="rpc-worker_test" target="1.8" />
+      <module name="rpc_integrationTest" target="1.8" />
+      <module name="rpc_main" target="1.8" />
+      <module name="rpc_smokeTest" target="1.8" />
+      <module name="rpc_test" target="1.8" />
+      <module name="samples_main" target="1.8" />
+      <module name="samples_test" target="1.8" />
       <module name="sandbox_main" target="1.8" />
       <module name="sandbox_test" target="1.8" />
+      <module name="serialization-deterministic_main" target="1.8" />
+      <module name="serialization-deterministic_test" target="1.8" />
+      <module name="serialization_main" target="1.8" />
+      <module name="serialization_test" target="1.8" />
       <module name="sgx-hsm-tool_main" target="1.8" />
       <module name="sgx-hsm-tool_test" target="1.8" />
       <module name="shell-cli_integrationTest" target="1.8" />
+      <module name="shell-cli_main" target="1.8" />
+      <module name="shell-cli_test" target="1.8" />
+      <module name="shell_integrationTest" target="1.8" />
+      <module name="shell_main" target="1.8" />
+      <module name="shell_test" target="1.8" />
+      <module name="simm-valuation-demo_integrationTest" target="1.8" />
+      <module name="simm-valuation-demo_main" target="1.8" />
+      <module name="simm-valuation-demo_scenario" target="1.8" />
       <module name="simm-valuation-demo_scenarioTest" target="1.8" />
+      <module name="simm-valuation-demo_test" target="1.8" />
+      <module name="smoke-test-utils_main" target="1.8" />
+      <module name="smoke-test-utils_test" target="1.8" />
       <module name="source-example-code_integrationTest" target="1.8" />
       <module name="source-example-code_main" target="1.8" />
       <module name="source-example-code_test" target="1.8" />
+      <module name="test-cli_main" target="1.8" />
+      <module name="test-cli_test" target="1.8" />
+      <module name="test-common_main" target="1.8" />
+      <module name="test-common_test" target="1.8" />
       <module name="test-utils_integrationTest" target="1.8" />
+      <module name="test-utils_main" target="1.8" />
+      <module name="test-utils_test" target="1.8" />
       <module name="testing-node-driver_integrationTest" target="1.8" />
       <module name="testing-node-driver_main" target="1.8" />
       <module name="testing-node-driver_test" target="1.8" />
@@ -112,6 +320,9 @@
       <module name="testing_test" target="1.8" />
       <module name="tools_main" target="1.8" />
       <module name="tools_test" target="1.8" />
+      <module name="trader-demo_integrationTest" target="1.8" />
+      <module name="trader-demo_main" target="1.8" />
+      <module name="trader-demo_test" target="1.8" />
       <module name="unwanteds_main" target="1.8" />
       <module name="unwanteds_test" target="1.8" />
       <module name="verifier_integrationTest" target="1.8" />
@@ -120,8 +331,15 @@
       <module name="verify-enclave_integrationTest" target="1.8" />
       <module name="verify-enclave_main" target="1.8" />
       <module name="verify-enclave_test" target="1.8" />
+      <module name="web_main" target="1.8" />
+      <module name="web_test" target="1.8" />
+      <module name="webcapsule_main" target="1.6" />
+      <module name="webcapsule_test" target="1.6" />
       <module name="webserver-webcapsule_main" target="1.8" />
       <module name="webserver-webcapsule_test" target="1.8" />
+      <module name="webserver_integrationTest" target="1.8" />
+      <module name="webserver_main" target="1.8" />
+      <module name="webserver_test" target="1.8" />
     </bytecodeTargetLevel>
   </component>
   <component name="JavacSettings">
diff --git a/docs/source/upgrade-notes.rst b/docs/source/upgrade-notes.rst
index 09b73e0eb3..161c6d3d0b 100644
--- a/docs/source/upgrade-notes.rst
+++ b/docs/source/upgrade-notes.rst
@@ -138,6 +138,5 @@ Upgrading from Corda Enterprise 3
 API Changes
 +++++++++++
 
-
 * MockNetwork: ``MockNodeParameters`` and functions creating it no longer use a lambda expecting a ``NodeConfiguration``
   object. Use a ``MockNetworkConfigOverrides`` object instead.
diff --git a/node/src/test/kotlin/net/corda/node/services/TimedFlowTests.kt b/node/src/test/kotlin/net/corda/node/services/TimedFlowTests.kt
index fdd4ce6b7c..d6b22a4311 100644
--- a/node/src/test/kotlin/net/corda/node/services/TimedFlowTests.kt
+++ b/node/src/test/kotlin/net/corda/node/services/TimedFlowTests.kt
@@ -73,9 +73,7 @@ class TimedFlowTestRule(val clusterSize: Int) : ExternalResource() {
                         legalName = CordaX500Name("Alice", "AliceCorp", "GB"),
                         configOverrides = MockNodeConfigOverrides(
                                 flowTimeout = MockNetFlowTimeOut(10.seconds, 3, 1.0)
-                        )
-                )
-        )
+                        )))
 
         // MockNetwork doesn't support notary clusters, so we create all the nodes we need unstarted, and then install the
         // network-parameters in their directories before they're started.