Minor changes to bring in-sync with OS (#1390)

core/src/main/kotlin/net/corda/core/crypto/internal/PlatformSecureRandom.kt

@@ -5,7 +5,6 @@ package net.corda.core.crypto.internal
 import net.corda.core.DeleteForDJVM
 import net.corda.core.crypto.CORDA_SECURE_RANDOM_ALGORITHM
 import net.corda.core.crypto.DummySecureRandom
-import net.corda.core.internal.VisibleForTesting
 import net.corda.core.utilities.SgxSupport
 import java.security.SecureRandom
 
@@ -13,7 +12,6 @@ import java.security.SecureRandom
  * This has been migrated into a separate class so that it
  * is easier to delete from the core-deterministic module.
  */
-@VisibleForTesting
 internal val platformSecureRandom = when {
     SgxSupport.isInsideEnclave -> DummySecureRandom
     else -> SecureRandom.getInstance(CORDA_SECURE_RANDOM_ALGORITHM)

core/src/main/kotlin/net/corda/core/internal/InternalUtils.kt

@@ -5,9 +5,6 @@ package net.corda.core.internal
 import net.corda.core.DeleteForDJVM
 import net.corda.core.KeepForDJVM
 import net.corda.core.crypto.*
-import net.corda.core.flows.FlowLogic
-import net.corda.core.node.ServicesForResolution
-import net.corda.core.schemas.MappedSchema
 import net.corda.core.serialization.*
 import net.corda.core.utilities.OpaqueBytes
 import net.corda.core.utilities.UntrustworthyData

core/src/main/kotlin/net/corda/core/internal/notary/TrustedAuthorityNotaryService.kt

@@ -50,7 +50,6 @@ abstract class TrustedAuthorityNotaryService : NotaryService() {
                 }
             } else throw e
         } catch (e: Exception) {
-            if (e is NotaryInternalException) throw  e
             log.error("Internal error", e)
             throw NotaryInternalException(NotaryError.General(Exception("Service unavailable, please try again later")))
         }

core/src/main/kotlin/net/corda/core/messaging/CordaRPCOps.kt

@@ -98,12 +98,6 @@ data class StateMachineTransactionMapping(val stateMachineRunId: StateMachineRun
 
 /** RPC operations that the node exposes to clients. */
 interface CordaRPCOps : RPCOps {
-    /**
-     * Returns the RPC protocol version, which is the same the node's Platform Version. Exists since version 1 so guaranteed
-     * to be present.
-     */
-    override val protocolVersion: Int get() = nodeInfo().platformVersion
-
     /** Returns a list of currently in-progress state machine infos. */
     fun stateMachinesSnapshot(): List<StateMachineInfo>
 

core/src/main/kotlin/net/corda/core/schemas/PersistentTypes.kt

@@ -47,7 +47,7 @@ open class MappedSchema(schemaFamily: Class<*>,
     val name: String = schemaFamily.name
 
     /**
-     * Points to a classpath resource containing the database changes for the [mappedTypes]
+     * Optional classpath resource containing the database changes for the [mappedTypes]
      */
     open val migrationResource: String? = null
 

core/src/main/kotlin/net/corda/core/transactions/TransactionBuilder.kt

@@ -17,8 +17,6 @@ import net.corda.core.node.services.AttachmentId
 import net.corda.core.node.services.KeyManagementService
 import net.corda.core.serialization.SerializationContext
 import net.corda.core.serialization.SerializationFactory
-import net.corda.core.utilities.contextLogger
-import net.corda.core.utilities.loggerFor
 import java.security.PublicKey
 import java.time.Duration
 import java.time.Instant
@@ -49,11 +47,6 @@ open class TransactionBuilder @JvmOverloads constructor(
         protected var privacySalt: PrivacySalt = PrivacySalt(),
         protected val references: MutableList<StateRef> = arrayListOf()
 ) {
-
-    private companion object {
-        val logger = loggerFor<TransactionBuilder>()
-    }
-
     private val inputsWithTransactionState = arrayListOf<TransactionState<ContractState>>()
     private val referencesWithTransactionState = arrayListOf<TransactionState<ContractState>>()
 

core/src/test/java/net/corda/core/flows/FlowsInJavaTest.java

@@ -100,18 +100,6 @@ public class FlowsInJavaTest {
         }
     }
 
-    @InitiatedBy(PrimitiveReceiveFlow.class)
-    private static class PrimitiveSendFlow extends FlowLogic<Void> {
-        public PrimitiveSendFlow(FlowSession session) {
-        }
-
-        @Suspendable
-        @Override
-        public Void call() throws FlowException {
-            return null;
-        }
-    }
-
     @InitiatingFlow
     private static class PrimitiveReceiveFlow extends FlowLogic<Void> {
         private final Party otherParty;

core/src/test/kotlin/net/corda/core/contracts/DummyContractV2Tests.kt

@@ -1 +0,0 @@
-