ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-03-02 20:49:06 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

CORDA-4130: Further simplication. Removed protected method.

Browse Source
This commit is contained in:
Adel El-Beik 2021-03-17 16:40:10 +00:00
parent 8cfd4eb202
commit 3023a2e1ac
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/src/main/kotlin/net/corda/core/transactions/BaseTransactions.kt
View File

@ -50,9 +50,4 @@ abstract class FullTransaction : BaseTransaction() {
"The specified transaction notary must be the one specified by all inputs and input references"
}
}
/** Make sure the assigned notary is part of the network parameter whitelist. */
protected fun checkNotaryWhitelisted() {
checkNotaryWhitelisted(this)
}
}

3
core/src/main/kotlin/net/corda/core/transactions/ContractUpgradeTransactions.kt
View File

@ -9,6 +9,7 @@ import net.corda.core.crypto.TransactionSignature
import net.corda.core.identity.Party
import net.corda.core.internal.AttachmentWithContext
import net.corda.core.internal.ServiceHubCoreInternal
import net.corda.core.internal.checkNotaryWhitelisted
import net.corda.core.internal.combinedHash
import net.corda.core.node.NetworkParameters
import net.corda.core.node.ServicesForResolution
@ -329,7 +330,7 @@ private constructor(
}
init {
checkNotaryWhitelisted()
checkNotaryWhitelisted(this)
// TODO: relax this constraint once upgrading encumbered states is supported.
check(inputs.all { it.state.contract == legacyContractClassName }) {
"All input states must point to the legacy contract"