Simplify swap and recovery execution #41
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
rishflab
force-pushed
the
automated
branch
3 times, most recently
from
c27b00d
to
4a28051
Compare
Consolidate and simplify swap execution. Generators are no longer needed. Consolidate recovery and swap data structures. The recursive calls can be replaced with a loop if returning prior to completion is desired for testing purposes. Fill out alice abort path Move state machine executors into seperate files Not compiling due to recursion/async issues Fix async recursion compilation errors Fix Bob swap execution Remove check for ack message from Alice. Seems like a bad idea to rely on an acknowledgement message instead of looking at the blockchain. Fix Bob abort Fix warnings Xmr lock complete Add TxCancel submit to XmrLocked Bob swap completed Remove alice
Tealised that the whole point is for them to be idempotent to be useful
rishflab
force-pushed
the
automated
branch
2 times, most recently
from
2043f36
to
f54075e
Compare
Save state0 in the swarm to process message0
Poll bob swarm to send encsig after calling send message3. Comment out unimplmented wait for transaction finality trait. Dial alice.
rishflab
changed the title
da-kami
reviewed
Dec 1, 2020
da-kami
reviewed
Dec 1, 2020
| } | ||
| } | ||
|
|
||
| // // State machine driver for recovery execution |
D4nte
approved these changes
Dec 1, 2020
swap/src/bin/simple_swap.rs
Outdated
| } | ||
|
|
||
| // State machine driver for recovery execution | ||
| pub async fn recover(state: AliceState, io: Io) -> Result<AliceState> { |
There was a problem hiding this comment.
So recover actually mean refund, right?
da-kami
approved these changes
Dec 1, 2020
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Consolidate and simplify swap execution. Generators are no longer
needed. Consolidate recovery and swap data structures. The
recursive calls can be replaced with a loop if returning prior to
completion is desired for testing purposes.