213 Commits

Author	SHA1	Message	Date
Franck Royer	8fada42074	Make config argument global ... The `config` argument apply to all commands. It is now optional and needs to be passed before a command. E.g. `cli --config ./config.toml history`	2021-02-15 11:01:50 +11:00
Franck Royer	eb39add5ff	Fix typo	2021-02-10 16:42:55 +11:00
Franck Royer	6e6dc320b4	Alice event loop now handles the creation of new swaps	2021-02-10 16:42:55 +11:00
Franck Royer	15eb9a2fe4	Remove punish test ... The punish test needs re-work due to the fact that Alice runs continuously Currently focusing on the CLI (Bob), so we can re-introduce this test once we want to ensure that nectar (Alice) punishes.	2021-02-10 16:42:55 +11:00
Franck Royer	3bc8b58b6a	Remove Bob restart tests after communication ... The test do not work without acks as we stop the event loop as soon as a message is considered as "sent" when actually the event loop and swarm may not have yet sent the message. The ack allow to avoid this issue as the message was considered "sent" only once the other party sent a response. However, the ack brings other issue so a review needs to be done to select the appropriate solution.	2021-02-10 16:42:55 +11:00
Franck Royer	fd9f633a77	Remove Alice restarts tests ... Current focus is on CLI UX. Fair amount of change needs to happen to cater for Alice (nectar) restart scenarios.	2021-02-10 16:42:55 +11:00
Daniel Karzel	86290649e7	work in review comments	2021-02-08 21:20:58 +11:00
Daniel Karzel	c930ad84a4	Add --force flag for cancel and refund	2021-02-08 21:19:38 +11:00
Daniel Karzel	02f8eb7f18	Add test for cancel/refund before timelock expired	2021-02-08 21:18:37 +11:00
Daniel Karzel	2d5d70d856	Timeout for Alice waiting for ack for sending transfer proof ... If dialing Bob fails Alice waits for the acknowledgement of the transfer proof indefinitely. The timout prevents her execution from hanging. Added a ToDo to re-visit the ack receivers. They don't add value at the moment and should be removed.	2021-02-08 21:18:37 +11:00
Daniel Karzel	c9adbde5d5	Add test for Bob's manual cancel and refund	2021-02-08 21:17:56 +11:00
Franck Royer	c316ea5244	Upgrade toolchain ... Needed to use libp2p-async-await	2021-02-04 15:18:33 +11:00
Daniel Karzel	89b3775e05	Rename config to execution_params	2021-01-29 17:27:50 +11:00
Daniel Karzel	802dc61e7e	Configuration for RPC urls and Bitcoin wallet name	2021-01-29 17:21:19 +11:00
Franck Royer	108cc1e6cc	Use trait instead of passing struct	2021-01-29 15:41:49 +11:00
Franck Royer	b8a9356d1b	Change expiries depending on the test goal	2021-01-29 13:29:24 +11:00
Franck Royer	49b8d19e41	test: Log state on failure	2021-01-29 11:36:13 +11:00
rishflab	1597f5336b	Restart event loop in tests ... Alice was attempting to create a new event loop using the same listen addr as the old one which was still running. This commit aborts the event loop before creating a new one.	2021-01-29 11:36:13 +11:00
rishflab	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	2021-01-29 11:36:10 +11:00
Franck Royer	f2a25ee49b	Move definitions out of lib.rs	2021-01-22 09:00:46 +11:00
Daniel Karzel	33a9057b1f	Move run_until is_target_state comparison functions into testutils	2021-01-21 23:39:55 +11:00
Daniel Karzel	3593f5323a	Bob saves lock proof after received so he can resume swap	2021-01-21 23:35:54 +11:00
Daniel Karzel	433704e48c	Top to bottom pub mod then mod then pub use then use (incl. use crate and use self)	2021-01-21 19:10:51 +11:00
Daniel Karzel	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)	2021-01-21 12:13:02 +11:00
Daniel Karzel	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.	2021-01-21 10:36:08 +11:00
Franck Royer	94045b9a69	Use builder in tests	2021-01-20 21:42:35 +11:00
Franck Royer	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.	2021-01-20 14:56:06 +11:00
Franck Royer	9148af2dbe	bob::SwapFactory should be consumed once a swap is returned	2021-01-20 14:51:37 +11:00
Franck Royer	b21dc03ed0	alice::SwapFactory should be consumed once a swap is returned	2021-01-20 14:51:36 +11:00
Franck Royer	9e3ef7ea24	Remove StartingBalances from release code	2021-01-20 14:51:35 +11:00
Franck Royer	181999e04f	Remove unnecessary alice qualifiers in alice::SwapFactor	2021-01-20 14:51:35 +11:00
Franck Royer	f0e6e45d56	Remove unecessary bob qualifier	2021-01-20 14:51:34 +11:00
Franck Royer	e26629b593	Remove unecessary fields from bob::SwapFactory	2021-01-20 14:51:34 +11:00
Franck Royer	96b1b18037	Keep terminology consistent ... Also avoid redundant qualifiers.	2021-01-20 14:51:33 +11:00
Daniel Karzel	37f619dbfc	Move StartingBalances into protocol module	2021-01-20 13:29:46 +11:00
Daniel Karzel	acfd43ee79	Rename Test to TestContext and argument to ctx	2021-01-20 10:40:40 +11:00
Daniel Karzel	82974412b2	Remove roles from SwapFactory name as implied by module and cleanup	2021-01-19 09:43:50 +11:00
Daniel Karzel	75f89f3b25	Use Bob swap factory in production	2021-01-19 09:16:05 +11:00
Daniel Karzel	3398ef8236	Use Alice swap factory in production	2021-01-19 09:16:05 +11:00
Daniel Karzel	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.	2021-01-19 09:16:04 +11:00
Daniel Karzel	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.	2021-01-19 09:16:04 +11:00
Daniel Karzel	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	2021-01-19 09:16:04 +11:00
Franck Royer	9a823dca4c	Do not introduced State6	2021-01-18 15:27:38 +11:00
Daniel Karzel	8615aaed6e	Make lock-tx id available in redeem/punish state to be able to assert exact fees	2021-01-18 14:45:47 +11:00
Daniel Karzel	317b251302	Re-arrange order of structs/functions in testutils ... move important things to the top and harmonize structure for alice and bob.	2021-01-18 14:10:17 +11:00
Daniel Karzel	7832ee94f3	Remove unused code and only expose necessary functionality	2021-01-18 14:10:17 +11:00
Daniel Karzel	8ef8240771	Refactor refund test	2021-01-18 14:10:16 +11:00
Daniel Karzel	55024572ae	Refactor punish test and punish assertions	2021-01-18 14:10:16 +11:00
Daniel Karzel	73a2841ec5	Refactor happy path bob restart tests	2021-01-18 14:10:00 +11:00
Daniel Karzel	8a2eb07928	Harmonize names and structure ... Simple renames and structure changes, no logical changes.	2021-01-15 19:34:51 +11:00
Daniel Karzel	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.	2021-01-15 19:29:26 +11:00
Daniel Karzel	59f9a1c286	Fix usage of StartingBalance in Alice and Bob	2021-01-15 19:03:11 +11:00
Daniel Karzel	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.	2021-01-15 18:46:14 +11:00
Daniel Karzel	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.	2021-01-15 18:14:19 +11:00
rishflab	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.	2021-01-15 11:26:32 +11:00
rishflab	f5cfe014be	Fix imports	2021-01-15 10:13:39 +11:00
Daniel Karzel	664958939d	Create network::Seed from swap::Seed instead of abstracting over byte array	2021-01-11 12:03:29 +11:00
Daniel Karzel	f18d01dfaf	Deterministic peer id from seed for bob	2021-01-11 12:03:29 +11:00
Daniel Karzel	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`.	2021-01-11 12:00:48 +11:00
rishflab	dcea54dbf1	Move protocol parent states into appropriate module	2021-01-08 12:34:36 +11:00
rishflab	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	2021-01-08 12:34:33 +11:00
Daniel Karzel	487b880371	Cleanup unused config param that was accidentally introduced	2021-01-07 12:23:29 +11:00
Daniel Karzel	e031681369	Add minimum monero confirmations to config use it for Bob	2021-01-06 17:17:37 +11:00
Daniel Karzel	4d9559fc2e	Monero network settings and testnet	2021-01-04 20:30:47 +11:00
Franck Royer	e1e8533862	Embed state mod in database mod ... The `Swap` struct is now database specific, no need to have a 20 lines module.	2020-12-23 15:30:23 +11:00
Franck Royer	59708c57e6	Move Alice and Bob db states in separate modules	2020-12-23 15:26:08 +11:00
Franck Royer	b410de01df	Move state.rs under database module ... The types in state are only used for the database	2020-12-23 15:20:24 +11:00
Franck Royer	8c7964bfee	Rename storage.rs to database.rs to reduce terminology variants	2020-12-23 15:17:27 +11:00
Franck Royer	4150e75488	Replace Try_From state conversion with From for Bob	2020-12-23 14:12:29 +11:00
Franck Royer	e541f7b83d	Replace TryFrom with From for Alice states	2020-12-23 14:12:29 +11:00
Franck Royer	a31db63e54	Improve state names and display	2020-12-23 14:12:29 +11:00
Franck Royer	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.	2020-12-23 14:12:26 +11:00
Franck Royer	405e377f79	Rename EncSign to EncSig ... `EncSig` means "encrypted signature", the item, not be confused with "signing", the action	2020-12-23 13:41:55 +11:00
Franck Royer	297b15e3ce	Remove async block when it is not needed	2020-12-23 09:17:56 +11:00
Franck Royer	e079b84500	Ensure we wait for other party to complete ... Before we check the balances.	2020-12-23 09:17:41 +11:00
Daniel Karzel	8296490764	Merge pull request #111 from comit-network/trace-xmr-btc ... Fix tracing subscribe filter for xmr-btc`	2020-12-22 16:17:27 +11:00
Daniel Karzel	5f8b7f2624	Fix tracing subscribe filter for xmr-btc`	2020-12-22 14:11:55 +11:00
Franck Royer	49b84d84b9	Add address at the start ... Do not carry peer id around as we currently only expect one peer.	2020-12-22 13:47:05 +11:00
Franck Royer	1e4b115556	Separate Bob restart tests ... To stabilize CI	2020-12-21 12:19:04 +11:00
Franck Royer	e366d3a73b	Join all futures to avoid hanging tests	2020-12-21 12:17:40 +11:00
Franck Royer	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.	2020-12-21 08:31:21 +11:00
Franck Royer	d9ea7ab605	Only carry the tx_lock_id instead of the full state	2020-12-21 08:19:39 +11:00
Franck Royer	edfab58246	Scope alice db ... To better match the restart scenario	2020-12-21 08:19:39 +11:00
Franck Royer	dc96b3d1e9	Stop running first event loop after Alice restarts	2020-12-21 08:19:39 +11:00
Franck Royer	638143a10d	Replace hard coded port by dynamic available one ... Fixes #84.	2020-12-21 08:19:31 +11:00
Franck Royer	2212758d17	Rename refund test as it is alice specific	2020-12-21 08:13:42 +11:00
bors[bot]	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>	2020-12-18 03:01:18 +00:00
Daniel Karzel	773eebc723	Cleanup resume_from_database functions only used in tests	2020-12-18 10:50:32 +11:00
Daniel Karzel	43d05935e7	Remove tor module	2020-12-17 18:50:15 +11:00
rishflab	9d266fc648	Add balance assertions to restart tests	2020-12-15 13:11:16 +11:00
Franck Royer	5ba830f3bf	Replace swap recover terminology with resume	2020-12-15 11:52:00 +11:00
Daniel Karzel	b83ab71669	Split up tests into separate files to overcome CI failure	2020-12-15 11:43:28 +11:00
Daniel Karzel	7cae6a9e4d	Add Bob restart test	2020-12-15 11:43:28 +11:00
Daniel Karzel	4ec2da29a0	Modularize Bob's test setup (separate init for state, event_loop)	2020-12-15 11:43:28 +11:00
Daniel Karzel	9a930af33f	Remove duplicated restart+refund test, move tests into separate files	2020-12-15 11:43:28 +11:00
Daniel Karzel	91d4d5da25	Cleanup swap execution to not return EventLoopHandle, refactor both_refund test	2020-12-15 11:43:28 +11:00
Daniel Karzel	bf39c34ada	Alice restart and refund test if restarted before encsig learner	2020-12-15 11:43:27 +11:00
Daniel Karzel	8c929564ef	Refactor container initialization	2020-12-15 11:43:27 +11:00
rishflab	143d8bc07d	Move message0 response handler out of NB	2020-12-15 11:43:24 +11:00
Daniel Karzel	4143394767	Add recovery function for Alice	2020-12-15 11:40:40 +11:00