Fix prepare script and cash config check

This commit is contained in:
Tommy Lillehagen 2018-02-12 10:36:44 +00:00
parent cca71e3d6e
commit 74e65f392f
2 changed files with 6 additions and 5 deletions

View File

@ -7,7 +7,7 @@ mkdir -p deps/corda/${VERSION}/apps
mkdir -p deps/drivers mkdir -p deps/drivers
# Copy Corda capsule into deps # 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 # 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 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 # Copy build artefacts into deps
cd experimental/behave cd experimental/behave
cp ../../tools/bootstrapper/build/libs/*.jar deps/corda/${VERSION}/network-bootstrapper.jar cp -v $(ls ../../tools/bootstrapper/build/libs/*.jar | tail -n1) deps/corda/${VERSION}/network-bootstrapper.jar
cp ../../finance/build/libs/corda-finance-*.jar deps/corda/${VERSION}/apps/corda-finance.jar cp -v $(ls ../../finance/build/libs/corda-finance-*.jar | tail -n1) deps/corda/${VERSION}/apps/corda-finance.jar

View File

@ -21,8 +21,9 @@ class Cash(state: ScenarioState) : Substeps(state) {
log.info("Can issue $issuableCurrency") log.info("Can issue $issuableCurrency")
} }
return@withClient config.issuableCurrencies.size return@withClient config.issuableCurrencies.size
} catch (_: Exception) { } catch (ex: Exception) {
return@withClient 0 log.warn("Failed to retrieve cash configuration data", ex)
throw ex
} }
} }
} }