From 74e65f392f3e3b5b85761aac8d62f152ad827f74 Mon Sep 17 00:00:00 2001
From: Tommy Lillehagen <tommy.lillehagen@r3.com>
Date: Mon, 12 Feb 2018 10:36:44 +0000
Subject: [PATCH] Fix prepare script and cash config check

---
 experimental/behave/prepare.sh                              | 6 +++---
 .../kotlin/net/corda/behave/scenarios/helpers/Cash.kt       | 5 +++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/experimental/behave/prepare.sh b/experimental/behave/prepare.sh
index 3912cf11be..02c5df162b 100755
--- a/experimental/behave/prepare.sh
+++ b/experimental/behave/prepare.sh
@@ -7,7 +7,7 @@ mkdir -p deps/corda/${VERSION}/apps
 mkdir -p deps/drivers
 
 # Copy Corda capsule into deps
-cp $(ls ../../node/capsule/build/libs/corda-*.jar | tail -n1) deps/corda/${VERSION}/corda.jar
+cp -v $(ls ../../node/capsule/build/libs/corda-*.jar | tail -n1) deps/corda/${VERSION}/corda.jar
 
 # Download database drivers
 curl "https://search.maven.org/remotecontent?filepath=com/h2database/h2/1.4.196/h2-1.4.196.jar" > deps/drivers/h2-1.4.196.jar
@@ -20,5 +20,5 @@ cd ../..
 
 # Copy build artefacts into deps
 cd experimental/behave
-cp ../../tools/bootstrapper/build/libs/*.jar deps/corda/${VERSION}/network-bootstrapper.jar
-cp ../../finance/build/libs/corda-finance-*.jar deps/corda/${VERSION}/apps/corda-finance.jar
+cp -v $(ls ../../tools/bootstrapper/build/libs/*.jar | tail -n1) deps/corda/${VERSION}/network-bootstrapper.jar
+cp -v $(ls ../../finance/build/libs/corda-finance-*.jar | tail -n1) deps/corda/${VERSION}/apps/corda-finance.jar
diff --git a/experimental/behave/src/scenario/kotlin/net/corda/behave/scenarios/helpers/Cash.kt b/experimental/behave/src/scenario/kotlin/net/corda/behave/scenarios/helpers/Cash.kt
index f119e5ebe0..0b59771164 100644
--- a/experimental/behave/src/scenario/kotlin/net/corda/behave/scenarios/helpers/Cash.kt
+++ b/experimental/behave/src/scenario/kotlin/net/corda/behave/scenarios/helpers/Cash.kt
@@ -21,8 +21,9 @@ class Cash(state: ScenarioState) : Substeps(state) {
                     log.info("Can issue $issuableCurrency")
                 }
                 return@withClient config.issuableCurrencies.size
-            } catch (_: Exception) {
-                return@withClient 0
+            } catch (ex: Exception) {
+                log.warn("Failed to retrieve cash configuration data", ex)
+                throw ex
             }
         }
     }