Merge pull request #220 from magic-wormhole/revert-dilation

Revert dilation

Reverts MR #196

Author: felinira

.github/workflows/push.yml

@@ -2,7 +2,7 @@ name: Rust
 
 on:
   push:
-    branches: [master, dev, dilation-1]
+    branches: [master, dev]
   pull_request:
     branches: [master, dev]
 
@@ -97,11 +97,6 @@ jobs:
         with:
           command: build
           args: -p magic-wormhole --no-default-features --features=forwarding
-      - name: build library (features=dilation)
-        uses: actions-rs/cargo@v1
-        with:
-          command: build
-          args: -p magic-wormhole --no-default-features --features=dilation
       - name: build CLI
         uses: actions-rs/cargo@v1
         with:

Cargo.lock

@@ -29,8 +29,6 @@ rand = "0.8.0"
 log = "0.4.13"
 base64 = "0.21.0"
 futures_ringbuf = "0.4.0"
-async-trait = "0.1.57"
-mockall_double = "0.3.0"
 time = { version = "0.3.7", features = ["formatting"] }
 instant = { version = "0.1.12", features = ["wasm-bindgen"] }
 
@@ -47,11 +45,12 @@ percent-encoding = { version = "2.1.0" }
 
 # Transit dependencies
 
+
 stun_codec = { version = "0.3.0", optional = true }
 bytecodec = { version = "0.4.15", optional = true }
-noise-protocol = { version = "0.2.0-rc1", optional = true }
 noise-rust-crypto = { version = "0.6.0-rc.1", optional = true }
-
+async-trait = { version = "0.1.57", optional = true }
+noise-protocol = { version = "0.2", optional = true }
 # Transfer dependencies
 
 rmp-serde = { version = "1.0.0", optional = true }
@@ -88,21 +87,20 @@ getrandom = { version = "0.2.5", features = ["js"] }
 [dev-dependencies]
 env_logger = "0.11"
 eyre = "0.6.5"
-mockall = "0.12"
 
 [features]
 transit = [
     "socket2",
     "stun_codec",
     "if-addrs",
     "bytecodec",
+    "async-trait",
     "noise-protocol",
     "noise-rust-crypto",
 ]
 transfer = ["transit", "tar", "async-tar", "rmp-serde", "zstd"]
-dilation = ["transit"]
 forwarding = ["transit", "rmp-serde"]
-default = ["transfer", "dilation"]
+default = ["transit", "transfer"]
 all = ["default", "forwarding"]
 
 [profile.release]

Cargo.toml

@@ -12,9 +12,7 @@ use futures::{future::Either, Future, FutureExt};
 use indicatif::{MultiProgress, ProgressBar};
 use std::{io::Write, path::PathBuf};
 
-use magic_wormhole::{
-    dilated_transfer, forwarding, transfer, transit, MailboxConnection, Wormhole,
-};
+use magic_wormhole::{forwarding, transfer, transit, MailboxConnection, Wormhole};
 
 fn install_ctrlc_handler(
 ) -> eyre::Result<impl Fn() -> futures::future::BoxFuture<'static, ()> + Clone> {
@@ -54,14 +52,6 @@ fn install_ctrlc_handler(
     })
 }
 
-// send, receive,
-#[derive(Debug, Args)]
-struct CommonTransferArgs {
-    /// Enable dilation
-    #[clap(long = "with-dilation", alias = "with-dilation")]
-    with_dilation: bool,
-}
-
 // send, send-many
 #[derive(Debug, Args)]
 struct CommonSenderArgs {
@@ -187,8 +177,6 @@ enum WormholeCommand {
         common_leader: CommonLeaderArgs,
         #[clap(flatten)]
         common_send: CommonSenderArgs,
-        #[clap(flatten)]
-        common_transfer: CommonTransferArgs,
     },
     /// Send a file to many recipients. READ HELP PAGE FIRST!
     #[clap(
@@ -231,8 +219,6 @@ enum WormholeCommand {
         common_follower: CommonFollowerArgs,
         #[clap(flatten)]
         common_receiver: CommonReceiverArgs,
-        #[clap(flatten)]
-        common_transfer: CommonTransferArgs,
     },
     /// Forward ports from one machine to another
     #[clap(subcommand)]
@@ -305,7 +291,6 @@ async fn main() -> eyre::Result<()> {
             common,
             common_leader: CommonLeaderArgs { code, code_length },
             common_send: CommonSenderArgs { file_name, files },
-            common_transfer: CommonTransferArgs { with_dilation: _ },
             ..
         } => {
             let offer = make_send_offer(files, file_name).await?;
@@ -386,31 +371,17 @@ async fn main() -> eyre::Result<()> {
             common,
             common_follower: CommonFollowerArgs { code },
             common_receiver: CommonReceiverArgs { file_path },
-            common_transfer: CommonTransferArgs { with_dilation },
             ..
         } => {
-            if with_dilation {
-                log::warn!("The dilation feature is still work in progress. Please remove the `--with-dilation` argument to avoid this.");
-            }
-
             let transit_abilities = parse_transit_args(&common);
             let (wormhole, _code, relay_hints) = {
-                let app_config = dilated_transfer::APP_CONFIG.with_dilation(with_dilation);
-                let app_config = if with_dilation {
-                    app_config.app_version(dilated_transfer::AppVersion::new(Some(
-                        dilated_transfer::FileTransferV2Mode::Receive,
-                    )))
-                } else {
-                    app_config
-                };
-
                 let connect_fut = Box::pin(parse_and_connect(
                     &mut term,
                     common,
                     code,
                     None,
                     false,
-                    app_config,
+                    transfer::APP_CONFIG,
                     None,
                     clipboard.as_mut(),
                 ));
@@ -420,21 +391,15 @@ async fn main() -> eyre::Result<()> {
                 }
             };
 
-            if with_dilation && peer_allows_dilation(wormhole.peer_version()) {
-                log::debug!("dilate wormhole");
-                let mut dilated_wormhole = wormhole.dilate()?; // need to pass transit relay URL
-                dilated_wormhole.run().await;
-            } else {
-                Box::pin(receive(
-                    wormhole,
-                    relay_hints,
-                    &file_path,
-                    noconfirm,
-                    transit_abilities,
-                    ctrl_c,
-                ))
-                .await?;
-            }
+            Box::pin(receive(
+                wormhole,
+                relay_hints,
+                &file_path,
+                noconfirm,
+                transit_abilities,
+                ctrl_c,
+            ))
+            .await?;
         },
         WormholeCommand::Forward(ForwardCommand::Serve {
             targets,
@@ -587,11 +552,6 @@ async fn main() -> eyre::Result<()> {
     Ok(())
 }
 
-fn peer_allows_dilation(_version: &serde_json::Value) -> bool {
-    // TODO needs to be implemented
-    true
-}
-
 fn parse_transit_args(args: &CommonArgs) -> transit::Abilities {
     match (args.force_direct, args.force_relay) {
         (false, false) => transit::Abilities::ALL_ABILITIES,
@@ -905,6 +865,7 @@ async fn send_many(
             MailboxConnection::connect(transfer::APP_CONFIG, code.clone(), false).await?,
         )
         .await?;
+
         send_in_background(
             relay_hints.clone(),
             make_send_offer(files.clone(), file_name.clone()).await?,