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

CORDA-1540 Remove no-longer-used StateMachineConfiguration (#3270)

Browse Source
This commit is contained in:
Rick Parker
2018-05-30 17:06:36 +01:00
committed by GitHub
parent 7b09795795
commit ef2772e328
3 changed files with 15 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
node/src/main/kotlin/net/corda/node/services/statemachine/SingleThreadedStateMachineManager.kt
View File

@ -21,7 +21,11 @@ import net.corda.core.internal.concurrent.OpenFuture
import net.corda.core.internal.concurrent.map import net.corda.core.internal.concurrent.map
import net.corda.core.internal.concurrent.openFuture import net.corda.core.internal.concurrent.openFuture
import net.corda.core.messaging.DataFeed import net.corda.core.messaging.DataFeed
import net.corda.core.serialization.* import net.corda.core.serialization.SerializationContext
import net.corda.core.serialization.SerializationDefaults
import net.corda.core.serialization.SerializedBytes
import net.corda.core.serialization.deserialize
import net.corda.core.serialization.serialize
import net.corda.core.utilities.ProgressTracker import net.corda.core.utilities.ProgressTracker
import net.corda.core.utilities.Try import net.corda.core.utilities.Try
import net.corda.core.utilities.contextLogger import net.corda.core.utilities.contextLogger
@ -32,9 +36,12 @@ import net.corda.node.services.api.ServiceHubInternal
import net.corda.node.services.config.shouldCheckCheckpoints import net.corda.node.services.config.shouldCheckCheckpoints
import net.corda.node.services.messaging.DeduplicationHandler import net.corda.node.services.messaging.DeduplicationHandler
import net.corda.node.services.messaging.ReceivedMessage import net.corda.node.services.messaging.ReceivedMessage
import net.corda.node.services.statemachine.interceptors.* import net.corda.node.services.statemachine.interceptors.DumpHistoryOnErrorInterceptor
import net.corda.node.services.statemachine.interceptors.FiberDeserializationChecker
import net.corda.node.services.statemachine.interceptors.FiberDeserializationCheckingInterceptor
import net.corda.node.services.statemachine.interceptors.HospitalisingInterceptor
import net.corda.node.services.statemachine.interceptors.PrintingInterceptor
import net.corda.node.services.statemachine.transitions.StateMachine import net.corda.node.services.statemachine.transitions.StateMachine
import net.corda.node.services.statemachine.transitions.StateMachineConfiguration
import net.corda.node.utilities.AffinityExecutor import net.corda.node.utilities.AffinityExecutor
import net.corda.nodeapi.internal.persistence.CordaPersistence import net.corda.nodeapi.internal.persistence.CordaPersistence
import net.corda.nodeapi.internal.persistence.wrapWithDatabaseTransaction import net.corda.nodeapi.internal.persistence.wrapWithDatabaseTransaction
@ -277,8 +284,6 @@ class SingleThreadedStateMachineManager(
} }
} }
private val stateMachineConfiguration = StateMachineConfiguration.default
private fun checkQuasarJavaAgentPresence() { private fun checkQuasarJavaAgentPresence() {
check(SuspendableHelper.isJavaAgentActive(), { check(SuspendableHelper.isJavaAgentActive(), {
"""Missing the '-javaagent' JVM argument. Make sure you run the tests with the Quasar java agent attached to your JVM. """Missing the '-javaagent' JVM argument. Make sure you run the tests with the Quasar java agent attached to your JVM.
@ -571,7 +576,7 @@ class SingleThreadedStateMachineManager(
database = database, database = database,
transitionExecutor = transitionExecutor, transitionExecutor = transitionExecutor,
actionExecutor = actionExecutor!!, actionExecutor = actionExecutor!!,
stateMachine = StateMachine(id, stateMachineConfiguration, secureRandom), stateMachine = StateMachine(id, secureRandom),
serviceHub = serviceHub, serviceHub = serviceHub,
checkpointSerializationContext = checkpointSerializationContext!! checkpointSerializationContext = checkpointSerializationContext!!
) )

23
node/src/main/kotlin/net/corda/node/services/statemachine/transitions/StateMachine.kt
View File

@ -1,30 +1,15 @@
package net.corda.node.services.statemachine.transitions package net.corda.node.services.statemachine.transitions
import net.corda.core.flows.* import net.corda.core.flows.StateMachineRunId
import net.corda.node.services.statemachine.* import net.corda.node.services.statemachine.Event
import net.corda.node.services.statemachine.StateMachineState
import java.security.SecureRandom import java.security.SecureRandom
/**
* @property eventQueueSize the size of a flow's event queue. If the queue gets full the thread scheduling the event
* will block. An example scenario would be if the flow is waiting for a lot of messages at once, but is slow at
* processing each.
*/
data class StateMachineConfiguration(
val eventQueueSize: Int
) {
companion object {
val default = StateMachineConfiguration(
eventQueueSize = 16
)
}
}
class StateMachine( class StateMachine(
val id: StateMachineRunId, val id: StateMachineRunId,
val configuration: StateMachineConfiguration,
val secureRandom: SecureRandom val secureRandom: SecureRandom
) { ) {
fun transition(event: Event, state: StateMachineState): TransitionResult { fun transition(event: Event, state: StateMachineState): TransitionResult {
return TopLevelTransition(TransitionContext(id, configuration, secureRandom), state, event).transition() return TopLevelTransition(TransitionContext(id, secureRandom), state, event).transition()
} }
} }

1
node/src/main/kotlin/net/corda/node/services/statemachine/transitions/Transition.kt
View File

@ -28,6 +28,5 @@ interface Transition {
class TransitionContext( class TransitionContext(
val id: StateMachineRunId, val id: StateMachineRunId,
val configuration: StateMachineConfiguration,
val secureRandom: SecureRandom val secureRandom: SecureRandom
) )