From 4c6c77323061f5ccf58d8a780522656205191a67 Mon Sep 17 00:00:00 2001 From: Igor Sirotin Date: Wed, 31 Jul 2024 16:54:55 +0100 Subject: [PATCH] chore_: clean up ReceiverConfig --- server/pairing/config.go | 19 ------------------- server/pairing/raw_message_handler.go | 1 + 2 files changed, 1 insertion(+), 19 deletions(-) diff --git a/server/pairing/config.go b/server/pairing/config.go index 96560b04d..b04233d57 100644 --- a/server/pairing/config.go +++ b/server/pairing/config.go @@ -7,7 +7,6 @@ import ( "github.com/status-im/status-go/api" "github.com/status-im/status-go/multiaccounts" - "github.com/status-im/status-go/params" "github.com/status-im/status-go/protocol/requests" ) @@ -27,32 +26,14 @@ type SenderConfig struct { type ReceiverConfig struct { CreateAccount *requests.CreateAccount `json:"createAccount" validate:"required"` - // ReceiverConfig.KeystorePath must not end with keyUID (because keyUID is not known yet) - // Deprecated: use CreateAccount.RootDataDir instead - KeystorePath string `json:"keystorePath"` - // DeviceType SendPairInstallation need this information // Deprecated: This field can be omitted, but is kept here until // https://github.com/status-im/status-go/issues/3351 is fully implemented. DeviceType string `json:"deviceType"` - // Deprecated: use CreateAccount.KdfIterations instead - KDFIterations int `json:"kdfIterations" validate:"gte=0"` - - // SettingCurrentNetwork corresponding to field current_network from table settings, so that we can override current network from sender - // Deprecated: use CreateAccount.SettingCurrentNetwork instead - SettingCurrentNetwork string `json:"settingCurrentNetwork"` - - // Deprecated: use CreateAccount.DeviceName instead - DeviceName string `json:"deviceName"` - // TODO: make those private DB *multiaccounts.Database `json:"-"` LoggedInKeyUID string `json:"-"` - - // nodeConfig will be generated - // Deprecated: use CreateAccount and build default node config instead - nodeConfig *params.NodeConfig } type KeystoreFilesConfig struct { diff --git a/server/pairing/raw_message_handler.go b/server/pairing/raw_message_handler.go index 5a152a691..b9a189451 100644 --- a/server/pairing/raw_message_handler.go +++ b/server/pairing/raw_message_handler.go @@ -11,6 +11,7 @@ import ( "github.com/status-im/status-go/api" "github.com/status-im/status-go/multiaccounts/accounts" "github.com/status-im/status-go/multiaccounts/settings" + "github.com/status-im/status-go/protocol/encryption/multidevice" "github.com/status-im/status-go/protocol/protobuf" "github.com/status-im/status-go/protocol/requests" "github.com/status-im/status-go/signal"