Skip to content
Snippets Groups Projects
Commit 1aa0d5ef authored by Jono Wenger's avatar Jono Wenger
Browse files

Fix cmd/fileTransfer

parent bf336572
No related branches found
No related tags found
4 merge requests!510Release,!226WIP: Api2.0,!210XX-3880 / Generic File Transfer,!207WIP: Client Restructure
...@@ -16,7 +16,6 @@ import ( ...@@ -16,7 +16,6 @@ import (
"github.com/spf13/cobra" "github.com/spf13/cobra"
jww "github.com/spf13/jwalterweatherman" jww "github.com/spf13/jwalterweatherman"
"github.com/spf13/viper" "github.com/spf13/viper"
"gitlab.com/elixxir/client/api"
ft "gitlab.com/elixxir/client/fileTransfer2" ft "gitlab.com/elixxir/client/fileTransfer2"
ftE2e "gitlab.com/elixxir/client/fileTransfer2/e2e" ftE2e "gitlab.com/elixxir/client/fileTransfer2/e2e"
"gitlab.com/elixxir/crypto/contact" "gitlab.com/elixxir/crypto/contact"
...@@ -154,7 +153,7 @@ func initFileTransferManager(client *messenger.Client, maxThroughput int) ( ...@@ -154,7 +153,7 @@ func initFileTransferManager(client *messenger.Client, maxThroughput int) (
// Create new manager // Create new manager
manager, err := ft.NewManager(p, manager, err := ft.NewManager(p,
client.GetUser().ReceptionID, client.GetUser().ReceptionID,
client.GetNetworkInterface(), client.GetCmix(),
client.GetStorage().GetKV(), client.GetStorage().GetKV(),
client.GetRng()) client.GetRng())
if err != nil { if err != nil {
...@@ -170,8 +169,7 @@ func initFileTransferManager(client *messenger.Client, maxThroughput int) ( ...@@ -170,8 +169,7 @@ func initFileTransferManager(client *messenger.Client, maxThroughput int) (
e2eParams := ftE2e.DefaultParams() e2eParams := ftE2e.DefaultParams()
e2eFt, err := ftE2e.NewWrapper(receiveCB, e2eParams, manager, e2eFt, err := ftE2e.NewWrapper(receiveCB, e2eParams, manager,
client.GetUser().ReceptionID, client.GetE2EHandler(), client.GetUser().ReceptionID, client.GetE2E(), client.GetCmix())
client.GetNetworkInterface())
if err != nil { if err != nil {
jww.FATAL.Panicf( jww.FATAL.Panicf(
"[FT] Failed to create new e2e file transfer wrapper: %+v", err) "[FT] Failed to create new e2e file transfer wrapper: %+v", err)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment