ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-03-01 04:16:21 +00:00
Code Issues Actions2 Packages Projects Releases Wiki Activity

Merge pull request from corda/chrisr3-verify-contract

Browse Source 
ENT-1463: Instantiate the contract class as part of contract verification.
This commit is contained in:
Chris Rankin 2018-04-03 10:16:16 +01:00 committed by GitHub
commit 87836361ea
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 7 deletions

12
core/src/main/kotlin/net/corda/core/transactions/LedgerTransaction.kt

@ -51,19 +51,17 @@ data class LedgerTransaction @JvmOverloads constructor(
} }
private companion object { private companion object {
private fun createContractFor(className: ContractClassName, classLoader: ClassLoader?): Try<Contract> { private fun contractClassFor(className: ContractClassName, classLoader: ClassLoader?): Try<Class<out Contract>> {
return Try.on { return Try.on {
(classLoader ?: this::class.java.classLoader) (classLoader ?: this::class.java.classLoader)
.loadClass(className) .loadClass(className)
.asSubclass(Contract::class.java) .asSubclass(Contract::class.java)
.getConstructor()
.newInstance()
} }
} }
} }
private val contracts: Map<ContractClassName, Try<Contract>> = (inputs.map { it.state } + outputs) private val contracts: Map<ContractClassName, Try<Class<out Contract>>> = (inputs.map { it.state } + outputs)
.map { it.contract to createContractFor(it.contract, it.data::class.java.classLoader) }.toMap() .map { it.contract to contractClassFor(it.contract, it.data::class.java.classLoader) }.toMap()
val inputStates: List<ContractState> get() = inputs.map { it.state.data } val inputStates: List<ContractState> get() = inputs.map { it.state.data }
@ -125,11 +123,11 @@ data class LedgerTransaction @JvmOverloads constructor(
when (result) { when (result) {
is Try.Failure -> throw TransactionVerificationException.ContractCreationError(id, key, result.exception) is Try.Failure -> throw TransactionVerificationException.ContractCreationError(id, key, result.exception)
is Try.Success -> { is Try.Success -> {
val contract = result.value
try { try {
val contract = result.value.newInstance()
contract.verify(this) contract.verify(this)
} catch (e: Throwable) { } catch (e: Throwable) {
throw TransactionVerificationException.ContractRejection(id, contract, e) throw TransactionVerificationException.ContractRejection(id, result.value.name, e)
} }
} }
} }