diff --git a/contracts/src/main/kotlin/com/r3corda/contracts/clause/Net.kt b/contracts/src/main/kotlin/com/r3corda/contracts/clause/Net.kt
index dee60e570c..506adfee13 100644
--- a/contracts/src/main/kotlin/com/r3corda/contracts/clause/Net.kt
+++ b/contracts/src/main/kotlin/com/r3corda/contracts/clause/Net.kt
@@ -67,10 +67,10 @@ open class NetClause
: SingleClause {
* Verify a netting command. This handles both close-out and payment netting.
*/
@VisibleForTesting
- public fun verifyNetCommand(inputs: List>,
- outputs: List>,
- command: AuthenticatedObject,
- netState: NetState) {
+ fun verifyNetCommand(inputs: List>,
+ outputs: List>,
+ command: AuthenticatedObject,
+ netState: NetState) {
val template = netState.template
// Create two maps of balances from obligors to beneficiaries, one for input states, the other for output states.
val inputBalances = extractAmountsDue(template, inputs)
diff --git a/core/src/test/kotlin/com/r3corda/core/crypto/X509UtilitiesTest.kt b/core/src/test/kotlin/com/r3corda/core/crypto/X509UtilitiesTest.kt
index ff4168c6ce..71b845af4f 100644
--- a/core/src/test/kotlin/com/r3corda/core/crypto/X509UtilitiesTest.kt
+++ b/core/src/test/kotlin/com/r3corda/core/crypto/X509UtilitiesTest.kt
@@ -196,7 +196,7 @@ class X509UtilitiesTest {
val context = SSLContext.getInstance("TLS")
val keyManagerFactory = KeyManagerFactory.getInstance(KeyManagerFactory.getDefaultAlgorithm())
keyManagerFactory.init(keyStore, "serverstorepass".toCharArray())
- val keyManagers = keyManagerFactory.getKeyManagers()
+ val keyManagers = keyManagerFactory.keyManagers
val trustMgrFactory = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm())
trustMgrFactory.init(trustStore)
val trustManagers = trustMgrFactory.trustManagers
diff --git a/experimental/src/main/kotlin/com/r3corda/contracts/universal/Arrangement.kt b/experimental/src/main/kotlin/com/r3corda/contracts/universal/Arrangement.kt
index e7ac7a0fa2..53056fe19b 100644
--- a/experimental/src/main/kotlin/com/r3corda/contracts/universal/Arrangement.kt
+++ b/experimental/src/main/kotlin/com/r3corda/contracts/universal/Arrangement.kt
@@ -19,7 +19,7 @@ interface Arrangement
// A base arrangement with no rights and no obligations. Contract cancellation/termination is a transition to ``Zero``.
class Zero() : Arrangement {
override fun hashCode(): Int {
- return 0;
+ return 0
}
override fun equals(other: Any?): Boolean {
return other is Zero
diff --git a/experimental/src/main/kotlin/com/r3corda/contracts/universal/Util.kt b/experimental/src/main/kotlin/com/r3corda/contracts/universal/Util.kt
index ef8ad8ed38..2f1ace5b9e 100644
--- a/experimental/src/main/kotlin/com/r3corda/contracts/universal/Util.kt
+++ b/experimental/src/main/kotlin/com/r3corda/contracts/universal/Util.kt
@@ -34,7 +34,7 @@ fun liableParties(contract: Arrangement) : Set {
throw IllegalArgumentException()
}
- return visit(contract);
+ return visit(contract)
}
/** returns list of involved parties for a given contract */
@@ -53,7 +53,7 @@ fun involvedParties(arrangement: Arrangement) : Set {
}
}
- return visit(arrangement);
+ return visit(arrangement)
}
fun replaceParty(action: Action, from: Party, to: Party) : Action {
diff --git a/experimental/src/test/kotlin/com/r3corda/contracts/BillOfLadingAgreementTests.kt b/experimental/src/test/kotlin/com/r3corda/contracts/BillOfLadingAgreementTests.kt
index e22564b3e7..cf634be1d4 100644
--- a/experimental/src/test/kotlin/com/r3corda/contracts/BillOfLadingAgreementTests.kt
+++ b/experimental/src/test/kotlin/com/r3corda/contracts/BillOfLadingAgreementTests.kt
@@ -36,7 +36,7 @@ class BillOfLadingAgreementTests {
quantity = 2500.0,
unit = LocDataStructures.WeightUnit.KG
)
- );
+ )
val Bill = BillOfLadingAgreement.State(
owner = MEGA_CORP_PUBKEY,
beneficiary = BOB,
@@ -149,14 +149,14 @@ class BillOfLadingAgreementTests {
command(MEGA_CORP_PUBKEY) { BillOfLadingAgreement.Commands.TransferPossession() }
timestamp(Instant.now())
//There are multiple commands
- this.`fails with`("List has more than one element.");
+ this `fails with` "List has more than one element."
}
transaction {
input { Bill }
output { Bill.copy(owner = CHARLIE_PUBKEY, beneficiary = CHARLIE) }
timestamp(Instant.now())
//There are no commands
- this.`fails with`("Required ${BillOfLadingAgreement.Commands::class.qualifiedName} command");
+ this `fails with` "Required ${BillOfLadingAgreement.Commands::class.qualifiedName} command"
}
}
@@ -167,7 +167,7 @@ class BillOfLadingAgreementTests {
output { Bill }
command(ALICE_PUBKEY) { BillOfLadingAgreement.Commands.IssueBL() }
timestamp(Instant.now())
- this.verifies();
+ this.verifies()
}
transaction {
@@ -175,14 +175,14 @@ class BillOfLadingAgreementTests {
output { Bill.copy(owner = CHARLIE_PUBKEY, beneficiary = CHARLIE) }
command(MEGA_CORP_PUBKEY, BOB_PUBKEY) { BillOfLadingAgreement.Commands.IssueBL() }
timestamp(Instant.now())
- this.`fails with`("there is no input state");
+ this `fails with` "there is no input state"
}
transaction {
output { Bill }
command(BOB_PUBKEY) { BillOfLadingAgreement.Commands.IssueBL() }
timestamp(Instant.now())
- this.`fails with`("the transaction is signed by the carrier");
+ this `fails with` "the transaction is signed by the carrier"
}
}
@@ -194,7 +194,7 @@ class BillOfLadingAgreementTests {
output { Bill.copy(owner = CHARLIE_PUBKEY, beneficiary = CHARLIE) }
command(MEGA_CORP_PUBKEY, BOB_PUBKEY) { BillOfLadingAgreement.Commands.TransferAndEndorseBL() }
timestamp(Instant.now())
- this.verifies();
+ this.verifies()
}
transaction {
@@ -202,7 +202,7 @@ class BillOfLadingAgreementTests {
output { Bill.copy(owner = CHARLIE_PUBKEY, beneficiary = CHARLIE) }
command(MEGA_CORP_PUBKEY, BOB_PUBKEY) { BillOfLadingAgreement.Commands.TransferAndEndorseBL() }
//There is no timestamp
- this.`fails with`("must be timestamped");
+ this `fails with` "must be timestamped"
}
transaction {
@@ -212,7 +212,7 @@ class BillOfLadingAgreementTests {
command(MEGA_CORP_PUBKEY, BOB_PUBKEY) { BillOfLadingAgreement.Commands.TransferAndEndorseBL() }
timestamp(Instant.now())
//There are two inputs
- this.`fails with`("List has more than one element.");
+ this `fails with` "List has more than one element."
}
transaction {
@@ -220,7 +220,7 @@ class BillOfLadingAgreementTests {
command(MEGA_CORP_PUBKEY, BOB_PUBKEY) { BillOfLadingAgreement.Commands.TransferAndEndorseBL() }
timestamp(Instant.now())
//There are no inputs
- this.`fails with`("List is empty.");
+ this `fails with` "List is empty."
}
transaction {
@@ -230,7 +230,7 @@ class BillOfLadingAgreementTests {
command(MEGA_CORP_PUBKEY, BOB_PUBKEY) { BillOfLadingAgreement.Commands.TransferAndEndorseBL() }
timestamp(Instant.now())
//There are two outputs
- this.`fails with`("List has more than one element.");
+ this `fails with` "List has more than one element."
}
transaction {
@@ -238,7 +238,7 @@ class BillOfLadingAgreementTests {
command(MEGA_CORP_PUBKEY, BOB_PUBKEY) { BillOfLadingAgreement.Commands.TransferAndEndorseBL() }
timestamp(Instant.now())
//There are no outputs
- this.`fails with`("List is empty.");
+ this `fails with` "List is empty."
}
transaction {
@@ -246,7 +246,7 @@ class BillOfLadingAgreementTests {
output { Bill.copy(owner = CHARLIE_PUBKEY, beneficiary = CHARLIE) }
command(MEGA_CORP_PUBKEY) { BillOfLadingAgreement.Commands.TransferAndEndorseBL() }
timestamp(Instant.now())
- this.`fails with`("the transaction is signed by the beneficiary");
+ this `fails with` "the transaction is signed by the beneficiary"
}
transaction {
@@ -254,7 +254,7 @@ class BillOfLadingAgreementTests {
output { Bill.copy(owner = CHARLIE_PUBKEY, beneficiary = CHARLIE) }
command(BOB_PUBKEY) { BillOfLadingAgreement.Commands.TransferAndEndorseBL() }
timestamp(Instant.now())
- this.`fails with`("the transaction is signed by the state object owner");
+ this `fails with` "the transaction is signed by the state object owner"
}
transaction {
@@ -262,7 +262,7 @@ class BillOfLadingAgreementTests {
output { Bill.copy(owner = CHARLIE_PUBKEY, beneficiary = CHARLIE, props = pros.copy(nameOfVessel = "Svet")) }
command(MEGA_CORP_PUBKEY, BOB_PUBKEY) { BillOfLadingAgreement.Commands.TransferAndEndorseBL() }
timestamp(Instant.now())
- this.`fails with`("the bill of lading agreement properties are unchanged");
+ this `fails with` "the bill of lading agreement properties are unchanged"
}
}
@@ -274,7 +274,7 @@ class BillOfLadingAgreementTests {
output { Bill.copy(owner = CHARLIE_PUBKEY) }
command(MEGA_CORP_PUBKEY) { BillOfLadingAgreement.Commands.TransferPossession() }
timestamp(Instant.now())
- this.verifies();
+ this.verifies()
}
transaction {
@@ -282,7 +282,7 @@ class BillOfLadingAgreementTests {
output { Bill.copy(owner = CHARLIE_PUBKEY) }
command(MEGA_CORP_PUBKEY) { BillOfLadingAgreement.Commands.TransferPossession() }
//There is no timestamp
- this.`fails with`("must be timestamped");
+ this `fails with` "must be timestamped"
}
transaction {
@@ -292,7 +292,7 @@ class BillOfLadingAgreementTests {
command(MEGA_CORP_PUBKEY) { BillOfLadingAgreement.Commands.TransferPossession() }
timestamp(Instant.now())
//There are two inputs
- this.`fails with`("List has more than one element.");
+ this `fails with` "List has more than one element."
}
transaction {
@@ -300,7 +300,7 @@ class BillOfLadingAgreementTests {
command(MEGA_CORP_PUBKEY) { BillOfLadingAgreement.Commands.TransferPossession() }
timestamp(Instant.now())
//There are no inputs
- this.`fails with`("List is empty.");
+ this `fails with` "List is empty."
}
transaction {
@@ -310,7 +310,7 @@ class BillOfLadingAgreementTests {
command(MEGA_CORP_PUBKEY) { BillOfLadingAgreement.Commands.TransferPossession() }
timestamp(Instant.now())
//There are two outputs
- this.`fails with`("List has more than one element.");
+ this `fails with` "List has more than one element."
}
transaction {
@@ -318,7 +318,7 @@ class BillOfLadingAgreementTests {
command(MEGA_CORP_PUBKEY) { BillOfLadingAgreement.Commands.TransferPossession() }
timestamp(Instant.now())
//There are no outputs
- this.`fails with`("List is empty.");
+ this `fails with` "List is empty."
}
transaction {
@@ -326,7 +326,7 @@ class BillOfLadingAgreementTests {
output { Bill.copy(owner = CHARLIE_PUBKEY) }
command(ALICE_PUBKEY) { BillOfLadingAgreement.Commands.TransferPossession() }
timestamp(Instant.now())
- this.`fails with`("the transaction is signed by the state object owner");
+ this `fails with` "the transaction is signed by the state object owner"
}
transaction {
@@ -334,7 +334,7 @@ class BillOfLadingAgreementTests {
output { Bill.copy(owner = CHARLIE_PUBKEY,beneficiary = CHARLIE) }
command(MEGA_CORP_PUBKEY) { BillOfLadingAgreement.Commands.TransferPossession() }
timestamp(Instant.now())
- this.`fails with`("the beneficiary is unchanged");
+ this `fails with` "the beneficiary is unchanged"
}
@@ -343,7 +343,7 @@ class BillOfLadingAgreementTests {
output { Bill.copy(owner = CHARLIE_PUBKEY, props = pros.copy(nameOfVessel = "Svet")) }
command(MEGA_CORP_PUBKEY) { BillOfLadingAgreement.Commands.TransferPossession() }
timestamp(Instant.now())
- this.`fails with`("the bill of lading agreement properties are unchanged");
+ this `fails with` "the bill of lading agreement properties are unchanged"
}
}
diff --git a/experimental/src/test/kotlin/com/r3corda/contracts/InvoiceTests.kt b/experimental/src/test/kotlin/com/r3corda/contracts/InvoiceTests.kt
index be2d427214..17e29a1d55 100644
--- a/experimental/src/test/kotlin/com/r3corda/contracts/InvoiceTests.kt
+++ b/experimental/src/test/kotlin/com/r3corda/contracts/InvoiceTests.kt
@@ -73,7 +73,7 @@ class InvoiceTests {
this `fails with` "the transaction is signed by the invoice owner"
}
- var props = invoiceProperties.copy(seller = invoiceProperties.buyer);
+ var props = invoiceProperties.copy(seller = invoiceProperties.buyer)
transaction {
output { initialInvoiceState.copy(props = props) }
command(MEGA_CORP_PUBKEY) { Invoice.Commands.Issue() }
@@ -88,7 +88,7 @@ class InvoiceTests {
this `fails with` "the invoice must not be assigned"
}
- props = invoiceProperties.copy(invoiceID = "");
+ props = invoiceProperties.copy(invoiceID = "")
transaction {
output { initialInvoiceState.copy(props = props) }
command(MEGA_CORP_PUBKEY) { Invoice.Commands.Issue() }
@@ -98,7 +98,7 @@ class InvoiceTests {
val withMessage = "the term must be a positive number"
val r = try {
- props = invoiceProperties.copy(term = 0);
+ props = invoiceProperties.copy(term = 0)
false
} catch (e: Exception) {
val m = e.message
@@ -179,7 +179,7 @@ class InvoiceTests {
this `fails with` "the transaction must be signed by the owner"
}
- var props = invoiceProperties.copy(seller = invoiceProperties.buyer);
+ var props = invoiceProperties.copy(seller = invoiceProperties.buyer)
transaction {
input { initialInvoiceState }
output { initialInvoiceState.copy(props = props) }
diff --git a/experimental/src/test/kotlin/com/r3corda/contracts/LOCTests.kt b/experimental/src/test/kotlin/com/r3corda/contracts/LOCTests.kt
index 4c0b8fca94..d70c0ac632 100644
--- a/experimental/src/test/kotlin/com/r3corda/contracts/LOCTests.kt
+++ b/experimental/src/test/kotlin/com/r3corda/contracts/LOCTests.kt
@@ -154,19 +154,19 @@ class LOCTests {
output { LOCstate.copy(issued = false) }
command(MEGA_CORP_PUBKEY) { LOC.Commands.Issuance() }
timestamp(Instant.now())
- this.`fails with`("the LOC must be Issued");
+ this `fails with` "the LOC must be Issued"
}
transaction {
output { LOCstate.copy(beneficiaryPaid = true, issued = true) }
command(MEGA_CORP_PUBKEY) { LOC.Commands.Issuance() }
timestamp(Instant.now())
- this.`fails with`("Demand Presentation must not be preformed successfully");
+ this `fails with` "Demand Presentation must not be preformed successfully"
}
transaction {
output { LOCstate.copy(terminated = true, issued = true) }
command(MEGA_CORP_PUBKEY) { LOC.Commands.Issuance() }
timestamp(Instant.now())
- this.`fails with`("LOC must not be terminated");
+ this `fails with` "LOC must not be terminated"
}
transaction {
output { LOCstate.copy(issued = true) }
@@ -179,7 +179,7 @@ class LOCTests {
// output { LOCstate.copy() }
command(MEGA_CORP_PUBKEY) { LOC.Commands.Issuance() }
timestamp(Instant.now())
- this.`fails with`("the period of presentation must be a positive number");
+ this `fails with` "the period of presentation must be a positive number"
}
}
@@ -199,7 +199,7 @@ class LOCTests {
command(ALICE_PUBKEY) { BillOfLadingAgreement.Commands.TransferAndEndorseBL() }
command(MEGA_CORP_PUBKEY) {Cash.Commands.Move()}
timestamp(Instant.now())
- this.verifies();
+ this.verifies()
}
transaction {
@@ -215,7 +215,7 @@ class LOCTests {
command(ALICE_PUBKEY) { Invoice.Commands.Extinguish()}
command(MEGA_CORP_PUBKEY) {Cash.Commands.Move()}
timestamp(Instant.now())
- this.`fails with`("the transaction is signed by the issuing bank");
+ this `fails with` "the transaction is signed by the issuing bank"
}
transaction {
@@ -231,7 +231,7 @@ class LOCTests {
command(ALICE_PUBKEY) { BillOfLadingAgreement.Commands.TransferAndEndorseBL() }
command(MEGA_CORP_PUBKEY) {Cash.Commands.Move()}
timestamp(Instant.now())
- this.`fails with`("the transaction is signed by the Beneficiary");
+ this `fails with` "the transaction is signed by the Beneficiary"
}
transaction {
@@ -247,7 +247,7 @@ class LOCTests {
command(ALICE_PUBKEY) { BillOfLadingAgreement.Commands.TransferAndEndorseBL() }
command(MEGA_CORP_PUBKEY) {Cash.Commands.Move()}
timestamp(Instant.now())
- this.`fails with`("the LOC properties do not remain the same");
+ this `fails with` "the LOC properties do not remain the same"
}
transaction {
@@ -263,7 +263,7 @@ class LOCTests {
command(ALICE_PUBKEY) { BillOfLadingAgreement.Commands.TransferAndEndorseBL() }
command(MEGA_CORP_PUBKEY) {Cash.Commands.Move()}
timestamp(Instant.now())
- this.`fails with`("the shipment is late");
+ this `fails with` "the shipment is late"
}
transaction {
@@ -279,7 +279,7 @@ class LOCTests {
command(ALICE_PUBKEY) { BillOfLadingAgreement.Commands.TransferAndEndorseBL() }
command(MEGA_CORP_PUBKEY) {Cash.Commands.Move()}
timestamp(Instant.now())
- this.`fails with`("the cash state has not been transferred");
+ this `fails with` "the cash state has not been transferred"
}
transaction {
@@ -295,7 +295,7 @@ class LOCTests {
command(ALICE_PUBKEY) { BillOfLadingAgreement.Commands.TransferAndEndorseBL() }
command(MEGA_CORP_PUBKEY) {Cash.Commands.Move()}
timestamp(Instant.now())
- this.`fails with`("the bill of lading has not been transferred");
+ this `fails with` "the bill of lading has not been transferred"
}
/* transaction {
@@ -327,7 +327,7 @@ class LOCTests {
command(ALICE_PUBKEY) { Invoice.Commands.Extinguish()}
command(MEGA_CORP_PUBKEY) {Cash.Commands.Move()}
timestamp(Instant.now())
- this.`fails with`("the beneficiary has not been paid, status not changed");
+ this `fails with` "the beneficiary has not been paid, status not changed"
}
transaction {
@@ -343,7 +343,7 @@ class LOCTests {
command(ALICE_PUBKEY) { Invoice.Commands.Extinguish()}
command(MEGA_CORP_PUBKEY) {Cash.Commands.Move()}
timestamp(Instant.now())
- this.`fails with`("the LOC must be Issued");
+ this `fails with` "the LOC must be Issued"
}
transaction {
@@ -359,7 +359,7 @@ class LOCTests {
command(ALICE_PUBKEY) { Invoice.Commands.Extinguish()}
command(MEGA_CORP_PUBKEY) {Cash.Commands.Move()}
timestamp(Instant.now())
- this.`fails with`("LOC must not be terminated");
+ this `fails with` "LOC must not be terminated"
}
}
@@ -375,7 +375,7 @@ class LOCTests {
command(MEGA_CORP_PUBKEY, CHARLIE_PUBKEY) { LOC.Commands.Termination() }
command(CHARLIE_PUBKEY) {Cash.Commands.Move()}
timestamp(Instant.now())
- this.verifies();
+ this.verifies()
}
transaction {
input { LOCstate.copy(issued = true, beneficiaryPaid = true) }
@@ -385,7 +385,7 @@ class LOCTests {
command(ALICE_PUBKEY, CHARLIE_PUBKEY) { LOC.Commands.Termination() }
command(CHARLIE_PUBKEY) {Cash.Commands.Move()}
timestamp(Instant.now())
- this.`fails with`("the transaction is signed by the issuing bank");
+ this `fails with` "the transaction is signed by the issuing bank"
}
/*transaction {
@@ -407,7 +407,7 @@ class LOCTests {
command(MEGA_CORP_PUBKEY, CHARLIE_PUBKEY) { LOC.Commands.Termination() }
command(CHARLIE_PUBKEY) {Cash.Commands.Move()}
timestamp(Instant.now())
- this.`fails with`("the cash state has not been transferred");
+ this `fails with` "the cash state has not been transferred"
}
transaction {
@@ -418,7 +418,7 @@ class LOCTests {
command(MEGA_CORP_PUBKEY, CHARLIE_PUBKEY) { LOC.Commands.Termination() }
command(CHARLIE_PUBKEY) {Cash.Commands.Move()}
timestamp(Instant.now())
- this.`fails with`("Empty collection can't be reduced");
+ this `fails with` "Empty collection can't be reduced"
}
transaction {
@@ -429,7 +429,7 @@ class LOCTests {
command(MEGA_CORP_PUBKEY, CHARLIE_PUBKEY) { LOC.Commands.Termination() }
command(CHARLIE_PUBKEY) {Cash.Commands.Move()}
timestamp(Instant.now())
- this.`fails with`("the beneficiary has not been paid, status not changed");
+ this `fails with` "the beneficiary has not been paid, status not changed"
}
transaction {
@@ -440,7 +440,7 @@ class LOCTests {
command(MEGA_CORP_PUBKEY, CHARLIE_PUBKEY) { LOC.Commands.Termination() }
command(CHARLIE_PUBKEY) {Cash.Commands.Move()}
timestamp(Instant.now())
- this.`fails with`("the LOC must be Issued");
+ this `fails with` "the LOC must be Issued"
}
transaction {
input { LOCstate.copy(issued = true, beneficiaryPaid = true) }
@@ -450,7 +450,7 @@ class LOCTests {
command(MEGA_CORP_PUBKEY, CHARLIE_PUBKEY) { LOC.Commands.Termination() }
command(CHARLIE_PUBKEY) {Cash.Commands.Move()}
timestamp(Instant.now())
- this.`fails with`("LOC should be terminated");
+ this `fails with` "LOC should be terminated"
}
transaction {
@@ -461,7 +461,7 @@ class LOCTests {
command(MEGA_CORP_PUBKEY, CHARLIE_PUBKEY) { LOC.Commands.Termination() }
command(CHARLIE_PUBKEY) {Cash.Commands.Move()}
timestamp(Instant.now())
- this.`fails with`("the LOC properties do not remain the same");
+ this `fails with` "the LOC properties do not remain the same"
}
}