77fc5743a2
Upgrade tokio to 1.0
...
Upgrade bitcoin harness dependency to latest commit
Upgrade backoff to fix failing tests. The previous version of backoff had a broken version of the retry function. Upgraded to a newer comit which fixes this problem.
Upgrade hyper to 0.14 as the 0.13 was bringing in tokio 0.2.24
Upgraded bitcoin harness to version that uses tokio 1.0 and reqwest 0.11
Upgrade reqwest to 0.11. Reqwest 0.11 uses tokio 1.0
Upgrade libp2p to 0.34 in preparation for tokio 1.0 upgrade
4 years ago
f2a25ee49b
Move definitions out of lib.rs
4 years ago
33a9057b1f
Move run_until is_target_state comparison functions into testutils
4 years ago
3593f5323a
Bob saves lock proof after received so he can resume swap
4 years ago
433704e48c
Top to bottom `pub mod` then `mod` then `pub use` then `use` (incl. `use crate` and `use self`)
4 years ago
6a75c840b5
Fix Alice redeem scenario
...
- Properly check the timelocks before trying to redeem
- Distinguish different failure scenarios and reactions to it.
- if we fail to construct the redeem transaction: wait for cancel.
- if we fail to publish the redeem transaction: wait for cancel but let the user know that restarting the application will result in retrying to publish the tx.
- if we succeed to publish the tx but then fail when waiting for finality, print error to the user (secreat already leaked, the user has to check manually if the tx was included)
4 years ago
8a7d746e96
Wait for Bob's refund finality
...
For Alice we ensure to wait for redeem/punish finality, so it should be the same for Bob.
4 years ago
94045b9a69
Use builder in tests
4 years ago
c11042ff0d
Use `builder` terminology instead of `factory`
...
This is not really a factory as a factory design pattern is about
producing several instances.
In the current usage, we are only interested in one swap instance. Once
the swap instance is created, the factory becomes useless. Hence, it is
more of a builder pattern.
4 years ago
9148af2dbe
`bob::SwapFactory` should be consumed once a swap is returned
4 years ago
b21dc03ed0
`alice::SwapFactory` should be consumed once a swap is returned
4 years ago
9e3ef7ea24
Remove `StartingBalances` from release code
4 years ago
181999e04f
Remove unnecessary `alice` qualifiers in `alice::SwapFactor`
4 years ago
f0e6e45d56
Remove unecessary `bob` qualifier
4 years ago
e26629b593
Remove unecessary fields from `bob::SwapFactory`
4 years ago
96b1b18037
Keep terminology consistent
...
Also avoid redundant qualifiers.
4 years ago
37f619dbfc
Move StartingBalances into protocol module
4 years ago
acfd43ee79
Rename Test to TestContext and argument to ctx
4 years ago
82974412b2
Remove roles from SwapFactory name as implied by module and cleanup
4 years ago
75f89f3b25
Use Bob swap factory in production
4 years ago
3398ef8236
Use Alice swap factory in production
4 years ago
67e925fe1f
Refactor Bob's peer-id and identity to be handled on the outside
...
Doing this in the behaviour is a weird indirection that is not needed.
4 years ago
0c19af9090
Refactor Alice's peer-id and identity to be handled on the outside
...
Doing this in the behaviour is a weird indirection that is not needed.
4 years ago
8bf467b550
Make the factory code usable in production
...
- Introduce Test abstraction instead of tow harnesses, move test specific data into Test
- Change the abstraction from actors to swap, because we are creating swaps, not actors
- rename actor::swap to run, because we are running a swap
4 years ago
9a823dca4c
Do not introduced State6
4 years ago
8615aaed6e
Make lock-tx id available in redeem/punish state to be able to assert exact fees
4 years ago
317b251302
Re-arrange order of structs/functions in testutils
...
move important things to the top and harmonize structure for alice and bob.
4 years ago
7832ee94f3
Remove unused code and only expose necessary functionality
4 years ago
8ef8240771
Refactor refund test
4 years ago
55024572ae
Refactor punish test and punish assertions
4 years ago
73a2841ec5
Refactor happy path bob restart tests
4 years ago
8a2eb07928
Harmonize names and structure
...
Simple renames and structure changes, no logical changes.
4 years ago
bede1c13dd
Refactor Bob's side (happy path + alice restart)
...
Refactor Bob's test setup in the same way as Alice's.
Introduce BobHarness that allows creating and restarting as well as asserting redeemed for Bob.
4 years ago
59f9a1c286
Fix usage of StartingBalance in Alice and Bob
4 years ago
87edec0d50
Rename Alice's factory to harness and include redeem assertions
...
This makes the redeem assertion reusable for all tests with a redeem scenario.
Since the factory was not a clean factory before and is now doing even more it was renamed to harness.
4 years ago
152c8d7eba
Refactor Alice restart test by introducing factory for creating Alices
...
The factory keeps all static state of Alice to be able to simulate a restart.
4 years ago
537d05e01e
Add reusable test function
...
We introduce a reusable test function to make it easier to add new tests and make our existing tests more readable.
4 years ago
f5cfe014be
Fix imports
4 years ago
664958939d
Create network::Seed from swap::Seed instead of abstracting over byte array
4 years ago
f18d01dfaf
Deterministic peer id from seed for bob
4 years ago
0a21040e08
Deterministic peer id from seed for alice
...
This includes the introduction of the --data-dir parameter instead of the --database.
Both the seed file and the database are stored in the data-dir, the database in sub-folder `database`.
4 years ago
dcea54dbf1
Move protocol parent states into appropriate module
4 years ago
c900d12593
Merge xmr_btc crate
...
Created network, storage and protocol modules. Organised
files into the modules where the belong.
xmr_btc crate moved into isolated modulein swap crate.
Remove the xmr_btc module and integrate into swap crate.
Consolidate message related code
Reorganise imports
Remove unused parent Message enum
Remove unused parent State enum
Remove unused dependencies from Cargo.toml
4 years ago
487b880371
Cleanup unused config param that was accidentally introduced
4 years ago
e031681369
Add minimum monero confirmations to config use it for Bob
4 years ago
4d9559fc2e
Monero network settings and testnet
4 years ago
e1e8533862
Embed state mod in database mod
...
The `Swap` struct is now database specific, no need to have a 20 lines
module.
4 years ago
59708c57e6
Move Alice and Bob db states in separate modules
4 years ago
b410de01df
Move state.rs under database module
...
The types in state are only used for the database
4 years ago
8c7964bfee
Rename storage.rs to database.rs to reduce terminology variants
4 years ago
4150e75488
Replace `Try_From` state conversion with `From` for Bob
4 years ago
e541f7b83d
Replace `TryFrom` with `From` for Alice states
4 years ago
a31db63e54
Improve state names and display
4 years ago
f0736d0906
Remove Refund timelock and T0/T1/T2
...
There are no refund timelock, only a cancellation timelock and punish
timelock.
Refund can be done as soon as the cancellation transaction is published.
4 years ago
405e377f79
Rename `EncSign` to `EncSig`
...
`EncSig` means "encrypted signature", the item,
not be confused with "signing", the action
4 years ago
297b15e3ce
Remove async block when it is not needed
4 years ago
e079b84500
Ensure we wait for other party to complete
...
Before we check the balances.
4 years ago
8296490764
Merge pull request #111 from comit-network/trace-xmr-btc
...
Fix tracing subscribe filter for xmr-btc`
4 years ago
5f8b7f2624
Fix tracing subscribe filter for xmr-btc`
4 years ago
49b84d84b9
Add address at the start
...
Do not carry peer id around as we currently only expect one peer.
4 years ago
1e4b115556
Separate Bob restart tests
...
To stabilize CI
4 years ago
e366d3a73b
Join all futures to avoid hanging tests
4 years ago
1a4bd0e2b4
Bob refunds swap after restart that requires communication
...
As Bob is dialing Alice, we now ensure that we are connected to Alice
at each step that needs communication.
If we are not connected, we proceed with dialing.
In an attempt to improve libp2p usage, we also add known address of
Alice first and only use peer_id to dial.
This ensures that we use the expected peer id.
4 years ago
d9ea7ab605
Only carry the tx_lock_id instead of the full state
4 years ago
edfab58246
Scope alice db
...
To better match the restart scenario
4 years ago
dc96b3d1e9
Stop running first event loop after Alice restarts
4 years ago
638143a10d
Replace hard coded port by dynamic available one
...
Fixes #84 .
4 years ago
2212758d17
Rename refund test as it is alice specific
4 years ago
3db71997d3
Merge #99
...
99: Cleanup resume_from_database functions only used in tests r=da-kami a=da-kami
Follow up of https://github.com/comit-network/xmr-btc-swap/pull/88
Co-authored-by: Daniel Karzel <daniel@comit.network>
4 years ago
773eebc723
Cleanup resume_from_database functions only used in tests
4 years ago
43d05935e7
Remove tor module
4 years ago
9d266fc648
Add balance assertions to restart tests
4 years ago
5ba830f3bf
Replace swap `recover` terminology with `resume`
4 years ago
b83ab71669
Split up tests into separate files to overcome CI failure
4 years ago
7cae6a9e4d
Add Bob restart test
4 years ago
4ec2da29a0
Modularize Bob's test setup (separate init for state, event_loop)
4 years ago
9a930af33f
Remove duplicated restart+refund test, move tests into separate files
4 years ago
91d4d5da25
Cleanup swap execution to not return EventLoopHandle, refactor both_refund test
4 years ago
bf39c34ada
Alice restart and refund test if restarted before encsig learner
4 years ago
8c929564ef
Refactor container initialization
4 years ago
143d8bc07d
Move message0 response handler out of NB
4 years ago
4143394767
Add recovery function for Alice
4 years ago
4b00141c29
Fix happy path test
4 years ago
7092af457a
Introduced DB for Alice & Bob
4 years ago
4ce8695dfc
Align with origin/database
4 years ago
1a5b9f9fa9
Update tests after rebase
4 years ago
caf903acda
wip: Add test for when bob restarts
4 years ago
7e0a1ffe84
Remove generator for bob
4 years ago
c6af5eb9ac
Introduce test where alice restarts before all communications are done
4 years ago
3580b7ed2c
Add test where Alice restart after encsign is learned
4 years ago
a22efaa7bc
Remove unneeded peer id argument
4 years ago
9323f22009
Reorder calls
4 years ago
a24d1a49b9
Remove unneeded `as_ref_calls`
4 years ago
1c7cc7ee46
Scope futures' instanciation
4 years ago
6226e5789f
Introduce test where alice restart mid-swap
4 years ago
71a0832ef4
Add zero const to monero::Amount
4 years ago
64b021daf4
Save Alice states in db
4 years ago
11cea9ba69
Remove passing alice peer id
...
The usage of the peer id is incorrect as we do not even check it when
dialing. For now, we can ignore it.
We can then re-introduce it and use it properly at a later stage.
4 years ago
082f4eb005
Use unused port in refund test
4 years ago
7af4b6980a
Test Alice refunds after Bob refund
...
Reworked Alice XmrLocked state transition handler to handle the
scenario when Alice received the encsig but Bob refunds.
Previously Alice was trying to redeem after receiving the encsig
without checking if t1 had elapsed.
4 years ago
rishflab
Franck Royer
Daniel Karzel
Daniel Karzel
bors[bot]