ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-05-04 09:43:05 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'remotes/origin/master' into mnesbit-cor-261-artemis-over-ssl

Browse Source
This commit is contained in:
Matthew Nesbit 2016-07-26 15:25:58 +01:00
commit 9a9df847af
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.idea/runConfigurations/All_tests.xml generated
View File

@ -17,6 +17,7 @@
<value defaultName="wholeProject" /> <value defaultName="wholeProject" />
</option> </option>
<envs /> <envs />
<fork_mode value="class" />
<patterns /> <patterns />
<method /> <method />
</configuration> </configuration>

6
core/src/main/kotlin/com/r3corda/protocols/TwoPartyDealProtocol.kt
View File

@ -439,12 +439,12 @@ object TwoPartyDealProtocol {
*/ */
class FixingRoleDecider(val ref: StateRef, class FixingRoleDecider(val ref: StateRef,
val timeout: Duration, val timeout: Duration,
override val progressTracker: ProgressTracker = tracker(ref.toString())) : ProtocolLogic<Unit>() { override val progressTracker: ProgressTracker = tracker()) : ProtocolLogic<Unit>() {
companion object { companion object {
class LOADING(ref: String) : ProgressTracker.Step("Loading state $ref to decide fixing role") class LOADING() : ProgressTracker.Step("Loading state to decide fixing role")
fun tracker(ref: String) = ProgressTracker(LOADING(ref)) fun tracker() = ProgressTracker(LOADING())
} }
override val topic: String get() = FIX_INITIATE_TOPIC override val topic: String get() = FIX_INITIATE_TOPIC