From 3023a2e1ac244b847a62eec31fdef09afd931c56 Mon Sep 17 00:00:00 2001
From: Adel El-Beik <adel.el-beik@r3.com>
Date: Wed, 17 Mar 2021 16:40:10 +0000
Subject: [PATCH] CORDA-4130: Further simplication. Removed protected method.

---
 .../kotlin/net/corda/core/transactions/BaseTransactions.kt   | 5 -----
 .../corda/core/transactions/ContractUpgradeTransactions.kt   | 3 ++-
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/core/src/main/kotlin/net/corda/core/transactions/BaseTransactions.kt b/core/src/main/kotlin/net/corda/core/transactions/BaseTransactions.kt
index 34f1fccf3b..11bde34c81 100644
--- a/core/src/main/kotlin/net/corda/core/transactions/BaseTransactions.kt
+++ b/core/src/main/kotlin/net/corda/core/transactions/BaseTransactions.kt
@@ -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)
-    }
 }
\ No newline at end of file
diff --git a/core/src/main/kotlin/net/corda/core/transactions/ContractUpgradeTransactions.kt b/core/src/main/kotlin/net/corda/core/transactions/ContractUpgradeTransactions.kt
index f1f53f90b8..48787b5cab 100644
--- a/core/src/main/kotlin/net/corda/core/transactions/ContractUpgradeTransactions.kt
+++ b/core/src/main/kotlin/net/corda/core/transactions/ContractUpgradeTransactions.kt
@@ -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"