From a636f33109130a9151553abf5e0253e35994ef60 Mon Sep 17 00:00:00 2001 From: Adam Babik Date: Mon, 9 Dec 2019 11:36:14 +0100 Subject: [PATCH] Set Whisper version submodule to v6 (#1725) --- eth-node/bridge/geth/envelope.go | 2 +- eth-node/bridge/geth/envelope_error.go | 2 +- eth-node/bridge/geth/envelope_event.go | 2 +- eth-node/bridge/geth/filter.go | 2 +- eth-node/bridge/geth/mailserver_response.go | 2 +- eth-node/bridge/geth/node.go | 2 +- eth-node/bridge/geth/public_whisper_api.go | 2 +- eth-node/bridge/geth/syncevent_response.go | 2 +- eth-node/bridge/geth/syncmailrequest.go | 2 +- eth-node/bridge/geth/whisper.go | 2 +- eth-node/go.mod | 4 ++-- eth-node/go.sum | 1 + go.mod | 4 ++-- mailserver/cleaner_test.go | 2 +- mailserver/mailserver.go | 2 +- mailserver/mailserver_db.go | 2 +- mailserver/mailserver_db_leveldb.go | 2 +- mailserver/mailserver_db_postgres.go | 2 +- mailserver/mailserver_test.go | 2 +- node/node.go | 2 +- node/node_api_test.go | 2 +- node/status_node.go | 2 +- node/status_node_test.go | 2 +- params/config.go | 2 +- peers/peerpool_test.go | 2 +- peers/topicpool_test.go | 2 +- protocol/go.mod | 4 ++-- protocol/message_processor_test.go | 2 +- protocol/messenger_test.go | 2 +- protocol/transport/whisper/filter_test.go | 2 +- services/shhext/api.go | 2 +- services/shhext/service_test.go | 2 +- t/benchmarks/mailserver_test.go | 2 +- t/benchmarks/messages_test.go | 2 +- t/benchmarks/utils_test.go | 2 +- t/e2e/node/manager_test.go | 2 +- t/e2e/suites.go | 2 +- t/e2e/whisper/whisper_mailbox_test.go | 2 +- t/e2e/whisper/whisper_test.go | 2 +- .../status-im/status-go/eth-node/bridge/geth/envelope.go | 2 +- .../status-go/eth-node/bridge/geth/envelope_error.go | 2 +- .../status-go/eth-node/bridge/geth/envelope_event.go | 2 +- .../status-im/status-go/eth-node/bridge/geth/filter.go | 2 +- .../status-go/eth-node/bridge/geth/mailserver_response.go | 2 +- .../status-im/status-go/eth-node/bridge/geth/node.go | 2 +- .../status-go/eth-node/bridge/geth/public_whisper_api.go | 2 +- .../status-go/eth-node/bridge/geth/syncevent_response.go | 2 +- .../status-go/eth-node/bridge/geth/syncmailrequest.go | 2 +- .../status-im/status-go/eth-node/bridge/geth/whisper.go | 2 +- vendor/github.com/status-im/status-go/protocol/go.mod | 4 ++-- vendor/github.com/status-im/status-go/whisper/{ => v6}/api.go | 0 .../github.com/status-im/status-go/whisper/{ => v6}/config.go | 0 vendor/github.com/status-im/status-go/whisper/{ => v6}/doc.go | 0 .../status-im/status-go/whisper/{ => v6}/envelope.go | 0 .../github.com/status-im/status-go/whisper/{ => v6}/events.go | 0 .../github.com/status-im/status-go/whisper/{ => v6}/filter.go | 0 .../github.com/status-im/status-go/whisper/{ => v6}/fuzz.go | 0 .../status-im/status-go/whisper/{ => v6}/gen_criteria_json.go | 0 .../status-im/status-go/whisper/{ => v6}/gen_message_json.go | 0 .../status-go/whisper/{ => v6}/gen_newmessage_json.go | 0 vendor/github.com/status-im/status-go/whisper/{ => v6}/go.mod | 0 vendor/github.com/status-im/status-go/whisper/{ => v6}/go.sum | 0 .../status-go/whisper/{ => v6}/mailserver_response.go | 0 .../status-im/status-go/whisper/{ => v6}/message.go | 0 .../status-im/status-go/whisper/{ => v6}/metrics.go | 0 .../github.com/status-im/status-go/whisper/{ => v6}/peer.go | 0 .../status-im/status-go/whisper/{ => v6}/rate_limiter.go | 0 .../github.com/status-im/status-go/whisper/{ => v6}/topic.go | 0 .../status-im/status-go/whisper/{ => v6}/whisper.go | 0 vendor/modules.txt | 4 ++-- 70 files changed, 56 insertions(+), 55 deletions(-) rename vendor/github.com/status-im/status-go/whisper/{ => v6}/api.go (100%) rename vendor/github.com/status-im/status-go/whisper/{ => v6}/config.go (100%) rename vendor/github.com/status-im/status-go/whisper/{ => v6}/doc.go (100%) rename vendor/github.com/status-im/status-go/whisper/{ => v6}/envelope.go (100%) rename vendor/github.com/status-im/status-go/whisper/{ => v6}/events.go (100%) rename vendor/github.com/status-im/status-go/whisper/{ => v6}/filter.go (100%) rename vendor/github.com/status-im/status-go/whisper/{ => v6}/fuzz.go (100%) rename vendor/github.com/status-im/status-go/whisper/{ => v6}/gen_criteria_json.go (100%) rename vendor/github.com/status-im/status-go/whisper/{ => v6}/gen_message_json.go (100%) rename vendor/github.com/status-im/status-go/whisper/{ => v6}/gen_newmessage_json.go (100%) rename vendor/github.com/status-im/status-go/whisper/{ => v6}/go.mod (100%) rename vendor/github.com/status-im/status-go/whisper/{ => v6}/go.sum (100%) rename vendor/github.com/status-im/status-go/whisper/{ => v6}/mailserver_response.go (100%) rename vendor/github.com/status-im/status-go/whisper/{ => v6}/message.go (100%) rename vendor/github.com/status-im/status-go/whisper/{ => v6}/metrics.go (100%) rename vendor/github.com/status-im/status-go/whisper/{ => v6}/peer.go (100%) rename vendor/github.com/status-im/status-go/whisper/{ => v6}/rate_limiter.go (100%) rename vendor/github.com/status-im/status-go/whisper/{ => v6}/topic.go (100%) rename vendor/github.com/status-im/status-go/whisper/{ => v6}/whisper.go (100%) diff --git a/eth-node/bridge/geth/envelope.go b/eth-node/bridge/geth/envelope.go index 9c7e738ea..884760b06 100644 --- a/eth-node/bridge/geth/envelope.go +++ b/eth-node/bridge/geth/envelope.go @@ -2,7 +2,7 @@ package gethbridge import ( "github.com/status-im/status-go/eth-node/types" - "github.com/status-im/status-go/whisper" + "github.com/status-im/status-go/whisper/v6" ) type gethEnvelopeWrapper struct { diff --git a/eth-node/bridge/geth/envelope_error.go b/eth-node/bridge/geth/envelope_error.go index a6364617e..5a8edf257 100644 --- a/eth-node/bridge/geth/envelope_error.go +++ b/eth-node/bridge/geth/envelope_error.go @@ -2,7 +2,7 @@ package gethbridge import ( "github.com/status-im/status-go/eth-node/types" - "github.com/status-im/status-go/whisper" + "github.com/status-im/status-go/whisper/v6" ) // NewGethEnvelopeErrorWrapper returns a types.EnvelopeError object that mimics Geth's EnvelopeError diff --git a/eth-node/bridge/geth/envelope_event.go b/eth-node/bridge/geth/envelope_event.go index dc4b9b82d..9836987a6 100644 --- a/eth-node/bridge/geth/envelope_event.go +++ b/eth-node/bridge/geth/envelope_event.go @@ -2,7 +2,7 @@ package gethbridge import ( "github.com/status-im/status-go/eth-node/types" - "github.com/status-im/status-go/whisper" + "github.com/status-im/status-go/whisper/v6" ) // NewGethEnvelopeEventWrapper returns a types.EnvelopeEvent object that mimics Geth's EnvelopeEvent diff --git a/eth-node/bridge/geth/filter.go b/eth-node/bridge/geth/filter.go index 865c320c3..914e17df8 100644 --- a/eth-node/bridge/geth/filter.go +++ b/eth-node/bridge/geth/filter.go @@ -2,7 +2,7 @@ package gethbridge import ( "github.com/status-im/status-go/eth-node/types" - "github.com/status-im/status-go/whisper" + "github.com/status-im/status-go/whisper/v6" ) type gethFilterWrapper struct { diff --git a/eth-node/bridge/geth/mailserver_response.go b/eth-node/bridge/geth/mailserver_response.go index 4a4fd2ce2..01cbb30a2 100644 --- a/eth-node/bridge/geth/mailserver_response.go +++ b/eth-node/bridge/geth/mailserver_response.go @@ -2,7 +2,7 @@ package gethbridge import ( "github.com/status-im/status-go/eth-node/types" - "github.com/status-im/status-go/whisper" + "github.com/status-im/status-go/whisper/v6" ) // NewGethMailServerResponseWrapper returns a types.MailServerResponse object that mimics Geth's MailServerResponse diff --git a/eth-node/bridge/geth/node.go b/eth-node/bridge/geth/node.go index 020f3c85d..727df926f 100644 --- a/eth-node/bridge/geth/node.go +++ b/eth-node/bridge/geth/node.go @@ -5,7 +5,7 @@ import ( gethens "github.com/status-im/status-go/eth-node/bridge/geth/ens" "github.com/status-im/status-go/eth-node/types" enstypes "github.com/status-im/status-go/eth-node/types/ens" - "github.com/status-im/status-go/whisper" + "github.com/status-im/status-go/whisper/v6" "go.uber.org/zap" ) diff --git a/eth-node/bridge/geth/public_whisper_api.go b/eth-node/bridge/geth/public_whisper_api.go index 99bc3689b..d26ba6dc4 100644 --- a/eth-node/bridge/geth/public_whisper_api.go +++ b/eth-node/bridge/geth/public_whisper_api.go @@ -5,7 +5,7 @@ import ( "github.com/ethereum/go-ethereum/common/hexutil" "github.com/status-im/status-go/eth-node/types" - "github.com/status-im/status-go/whisper" + "github.com/status-im/status-go/whisper/v6" ) type gethPublicWhisperAPIWrapper struct { diff --git a/eth-node/bridge/geth/syncevent_response.go b/eth-node/bridge/geth/syncevent_response.go index 09eea583c..e9969a0eb 100644 --- a/eth-node/bridge/geth/syncevent_response.go +++ b/eth-node/bridge/geth/syncevent_response.go @@ -2,7 +2,7 @@ package gethbridge import ( "github.com/status-im/status-go/eth-node/types" - "github.com/status-im/status-go/whisper" + "github.com/status-im/status-go/whisper/v6" ) // NewGethSyncEventResponseWrapper returns a types.SyncEventResponse object that mimics Geth's SyncEventResponse diff --git a/eth-node/bridge/geth/syncmailrequest.go b/eth-node/bridge/geth/syncmailrequest.go index a8ad76b0b..1cb4af454 100644 --- a/eth-node/bridge/geth/syncmailrequest.go +++ b/eth-node/bridge/geth/syncmailrequest.go @@ -2,7 +2,7 @@ package gethbridge import ( "github.com/status-im/status-go/eth-node/types" - "github.com/status-im/status-go/whisper" + "github.com/status-im/status-go/whisper/v6" ) // GetGethSyncMailRequestFrom converts a whisper SyncMailRequest struct from a SyncMailRequest struct diff --git a/eth-node/bridge/geth/whisper.go b/eth-node/bridge/geth/whisper.go index 009884f54..1780cd68e 100644 --- a/eth-node/bridge/geth/whisper.go +++ b/eth-node/bridge/geth/whisper.go @@ -5,7 +5,7 @@ import ( "time" "github.com/status-im/status-go/eth-node/types" - "github.com/status-im/status-go/whisper" + "github.com/status-im/status-go/whisper/v6" ) type gethWhisperWrapper struct { diff --git a/eth-node/go.mod b/eth-node/go.mod index 82d77f515..5834a08a4 100644 --- a/eth-node/go.mod +++ b/eth-node/go.mod @@ -6,14 +6,14 @@ replace github.com/ethereum/go-ethereum v1.9.5 => github.com/status-im/go-ethere replace github.com/status-im/status-go/extkeys => ../extkeys -replace github.com/status-im/status-go/whisper => ../whisper +replace github.com/status-im/status-go/whisper/v6 => ../whisper require ( github.com/ethereum/go-ethereum v1.9.5 github.com/mattn/go-pointer v0.0.0-20190911064623-a0a44394634f github.com/status-im/doubleratchet v3.0.0+incompatible github.com/status-im/status-go/extkeys v1.0.0 // indirect - github.com/status-im/status-go/whisper v1.0.0 // indirect + github.com/status-im/status-go/whisper/v6 v6.0.0 // indirect github.com/stretchr/testify v1.4.0 github.com/wealdtech/go-ens/v3 v3.0.9 go.uber.org/zap v1.13.0 diff --git a/eth-node/go.sum b/eth-node/go.sum index b6b32c70c..9b8134040 100644 --- a/eth-node/go.sum +++ b/eth-node/go.sum @@ -229,6 +229,7 @@ github.com/syndtr/goleveldb v0.0.0-20181128100959-b001fa50d6b2 h1:GnOzE5fEFN3b2z github.com/syndtr/goleveldb v0.0.0-20181128100959-b001fa50d6b2/go.mod h1:Z4AUp2Km+PwemOoO/VB5AOx9XSsIItzFjoJlOSiYmn0= github.com/syndtr/goleveldb v1.0.0 h1:fBdIW9lB4Iz0n9khmH8w27SJ3QEJ7+IgjPEwGSZiFdE= github.com/syndtr/goleveldb v1.0.0/go.mod h1:ZVVdQEZoIme9iO1Ch2Jdy24qqXrMMOU6lpPAyBWyWuQ= +github.com/tsenart/tb v0.0.0-20181025101425-0d2499c8b6e9 h1:kjbwitOGH46vD01f2s3leBfrMnePQa3NSAIlW35MvY8= github.com/tsenart/tb v0.0.0-20181025101425-0d2499c8b6e9/go.mod h1:EcGP24b8DY+bWHnpfJDP7fM+o8Nmz4fYH0l2xTtNr3I= github.com/tyler-smith/go-bip39 v1.0.2 h1:+t3w+KwLXO6154GNJY+qUtIxLTmFjfUmpguQT1OlOT8= github.com/tyler-smith/go-bip39 v1.0.2/go.mod h1:sJ5fKU0s6JVwZjjcUEX2zFOnvq0ASQ2K9Zr6cf67kNs= diff --git a/go.mod b/go.mod index 435899796..33ac16837 100644 --- a/go.mod +++ b/go.mod @@ -16,7 +16,7 @@ replace github.com/status-im/status-go/extkeys => ./extkeys replace github.com/status-im/status-go/eth-node => ./eth-node -replace github.com/status-im/status-go/whisper => ./whisper +replace github.com/status-im/status-go/whisper/v6 => ./whisper require ( github.com/beevik/ntp v0.2.0 @@ -46,7 +46,7 @@ require ( github.com/status-im/status-go/eth-node v0.0.0-20191126161717-86bc127b3d0a github.com/status-im/status-go/extkeys v1.0.0 github.com/status-im/status-go/protocol v0.5.2 - github.com/status-im/status-go/whisper v1.0.0 + github.com/status-im/status-go/whisper/v6 v6.0.0 github.com/status-im/tcp-shaker v0.0.0-20191114194237-215893130501 github.com/stretchr/testify v1.4.0 github.com/syndtr/goleveldb v1.0.0 diff --git a/mailserver/cleaner_test.go b/mailserver/cleaner_test.go index ed1169169..883a3c3ec 100644 --- a/mailserver/cleaner_test.go +++ b/mailserver/cleaner_test.go @@ -7,7 +7,7 @@ import ( "github.com/ethereum/go-ethereum/rlp" "github.com/status-im/status-go/eth-node/types" - "github.com/status-im/status-go/whisper" + "github.com/status-im/status-go/whisper/v6" "github.com/stretchr/testify/require" "github.com/syndtr/goleveldb/leveldb" "github.com/syndtr/goleveldb/leveldb/storage" diff --git a/mailserver/mailserver.go b/mailserver/mailserver.go index 84db57140..cc9bbca25 100644 --- a/mailserver/mailserver.go +++ b/mailserver/mailserver.go @@ -31,7 +31,7 @@ import ( "github.com/ethereum/go-ethereum/rlp" "github.com/status-im/status-go/eth-node/types" "github.com/status-im/status-go/params" - "github.com/status-im/status-go/whisper" + "github.com/status-im/status-go/whisper/v6" prom "github.com/prometheus/client_golang/prometheus" ) diff --git a/mailserver/mailserver_db.go b/mailserver/mailserver_db.go index 8107be1b6..2be6172a0 100644 --- a/mailserver/mailserver_db.go +++ b/mailserver/mailserver_db.go @@ -3,7 +3,7 @@ package mailserver import ( "time" - "github.com/status-im/status-go/whisper" + "github.com/status-im/status-go/whisper/v6" ) // DB is an interface to abstract interactions with the db so that the mailserver diff --git a/mailserver/mailserver_db_leveldb.go b/mailserver/mailserver_db_leveldb.go index da2eef1e5..4f742b5b4 100644 --- a/mailserver/mailserver_db_leveldb.go +++ b/mailserver/mailserver_db_leveldb.go @@ -8,7 +8,7 @@ import ( "github.com/ethereum/go-ethereum/rlp" "github.com/status-im/status-go/eth-node/types" "github.com/status-im/status-go/params" - "github.com/status-im/status-go/whisper" + "github.com/status-im/status-go/whisper/v6" "github.com/syndtr/goleveldb/leveldb" "github.com/syndtr/goleveldb/leveldb/errors" "github.com/syndtr/goleveldb/leveldb/iterator" diff --git a/mailserver/mailserver_db_postgres.go b/mailserver/mailserver_db_postgres.go index e153c4821..6210d7454 100644 --- a/mailserver/mailserver_db_postgres.go +++ b/mailserver/mailserver_db_postgres.go @@ -16,7 +16,7 @@ import ( "github.com/ethereum/go-ethereum/log" "github.com/ethereum/go-ethereum/rlp" "github.com/status-im/status-go/eth-node/types" - "github.com/status-im/status-go/whisper" + "github.com/status-im/status-go/whisper/v6" ) func NewPostgresDB(config *params.WhisperConfig) (*PostgresDB, error) { diff --git a/mailserver/mailserver_test.go b/mailserver/mailserver_test.go index fd6a3527e..5206e3a2e 100644 --- a/mailserver/mailserver_test.go +++ b/mailserver/mailserver_test.go @@ -34,7 +34,7 @@ import ( "github.com/ethereum/go-ethereum/rlp" "github.com/status-im/status-go/eth-node/types" "github.com/status-im/status-go/params" - "github.com/status-im/status-go/whisper" + "github.com/status-im/status-go/whisper/v6" "github.com/stretchr/testify/suite" ) diff --git a/node/node.go b/node/node.go index 9ab21912e..f30777a8a 100644 --- a/node/node.go +++ b/node/node.go @@ -34,7 +34,7 @@ import ( "github.com/status-im/status-go/services/status" "github.com/status-im/status-go/static" "github.com/status-im/status-go/timesource" - "github.com/status-im/status-go/whisper" + "github.com/status-im/status-go/whisper/v6" "github.com/syndtr/goleveldb/leveldb" ) diff --git a/node/node_api_test.go b/node/node_api_test.go index 7c0444b57..e8d0e74f2 100644 --- a/node/node_api_test.go +++ b/node/node_api_test.go @@ -6,7 +6,7 @@ import ( "github.com/ethereum/go-ethereum/accounts" "github.com/status-im/status-go/params" - "github.com/status-im/status-go/whisper" + "github.com/status-im/status-go/whisper/v6" "github.com/stretchr/testify/require" ) diff --git a/node/status_node.go b/node/status_node.go index a6f2241b5..6e398bda4 100644 --- a/node/status_node.go +++ b/node/status_node.go @@ -20,7 +20,7 @@ import ( "github.com/ethereum/go-ethereum/p2p/enode" "github.com/ethereum/go-ethereum/p2p/enr" ma "github.com/multiformats/go-multiaddr" - "github.com/status-im/status-go/whisper" + "github.com/status-im/status-go/whisper/v6" "github.com/syndtr/goleveldb/leveldb" "github.com/status-im/status-go/db" diff --git a/node/status_node_test.go b/node/status_node_test.go index 896a72a78..78dc59b39 100644 --- a/node/status_node_test.go +++ b/node/status_node_test.go @@ -17,7 +17,7 @@ import ( gethnode "github.com/ethereum/go-ethereum/node" "github.com/ethereum/go-ethereum/p2p" "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/status-im/status-go/whisper" + "github.com/status-im/status-go/whisper/v6" "github.com/status-im/status-go/discovery" "github.com/status-im/status-go/params" diff --git a/params/config.go b/params/config.go index 8248f3611..d8c696877 100644 --- a/params/config.go +++ b/params/config.go @@ -17,7 +17,7 @@ import ( "github.com/ethereum/go-ethereum/p2p/discv5" "github.com/ethereum/go-ethereum/params" "github.com/status-im/status-go/static" - "github.com/status-im/status-go/whisper" + "github.com/status-im/status-go/whisper/v6" validator "gopkg.in/go-playground/validator.v9" ) diff --git a/peers/peerpool_test.go b/peers/peerpool_test.go index bf67954c4..7d93980e4 100644 --- a/peers/peerpool_test.go +++ b/peers/peerpool_test.go @@ -25,7 +25,7 @@ import ( "github.com/status-im/status-go/discovery" "github.com/status-im/status-go/params" "github.com/status-im/status-go/signal" - "github.com/status-im/status-go/whisper" + "github.com/status-im/status-go/whisper/v6" ) type PeerPoolSimulationSuite struct { diff --git a/peers/topicpool_test.go b/peers/topicpool_test.go index c73a28688..d6dd59ebf 100644 --- a/peers/topicpool_test.go +++ b/peers/topicpool_test.go @@ -12,7 +12,7 @@ import ( "github.com/ethereum/go-ethereum/p2p/enode" "github.com/status-im/status-go/params" "github.com/status-im/status-go/t/helpers" - "github.com/status-im/status-go/whisper" + "github.com/status-im/status-go/whisper/v6" "github.com/stretchr/testify/require" "github.com/stretchr/testify/suite" ) diff --git a/protocol/go.mod b/protocol/go.mod index ba29bd3fe..4d0a71da3 100644 --- a/protocol/go.mod +++ b/protocol/go.mod @@ -8,7 +8,7 @@ replace github.com/gomarkdown/markdown => github.com/status-im/markdown v0.0.0-2 replace github.com/status-im/status-go/eth-node => ../eth-node -replace github.com/status-im/status-go/whisper => ../whisper +replace github.com/status-im/status-go/whisper/v6 => ../whisper require ( github.com/cenkalti/backoff/v3 v3.0.0 @@ -25,7 +25,7 @@ require ( github.com/status-im/doubleratchet v3.0.0+incompatible github.com/status-im/migrate/v4 v4.6.2-status.2 github.com/status-im/status-go/eth-node v0.0.0-20191120100713-5053b0b6835b - github.com/status-im/status-go/whisper v1.0.0 + github.com/status-im/status-go/whisper/v6 v6.0.0 github.com/stretchr/testify v1.4.0 github.com/vacp2p/mvds v0.0.23 go.uber.org/zap v1.13.0 diff --git a/protocol/message_processor_test.go b/protocol/message_processor_test.go index 87c224406..2012af0f8 100644 --- a/protocol/message_processor_test.go +++ b/protocol/message_processor_test.go @@ -21,7 +21,7 @@ import ( "github.com/status-im/status-go/protocol/sqlite" transport "github.com/status-im/status-go/protocol/transport/whisper" v1protocol "github.com/status-im/status-go/protocol/v1" - "github.com/status-im/status-go/whisper" + "github.com/status-im/status-go/whisper/v6" datasyncproto "github.com/vacp2p/mvds/protobuf" ) diff --git a/protocol/messenger_test.go b/protocol/messenger_test.go index 7a137b886..284dce72d 100644 --- a/protocol/messenger_test.go +++ b/protocol/messenger_test.go @@ -21,7 +21,7 @@ import ( "github.com/status-im/status-go/protocol/protobuf" "github.com/status-im/status-go/protocol/sqlite" "github.com/status-im/status-go/protocol/tt" - "github.com/status-im/status-go/whisper" + "github.com/status-im/status-go/whisper/v6" "github.com/stretchr/testify/suite" "go.uber.org/zap" ) diff --git a/protocol/transport/whisper/filter_test.go b/protocol/transport/whisper/filter_test.go index 8644449e1..177b114a8 100644 --- a/protocol/transport/whisper/filter_test.go +++ b/protocol/transport/whisper/filter_test.go @@ -14,7 +14,7 @@ import ( _ "github.com/mutecomm/go-sqlcipher" "github.com/status-im/status-go/eth-node/crypto" - "github.com/status-im/status-go/whisper" + "github.com/status-im/status-go/whisper/v6" "github.com/stretchr/testify/suite" "go.uber.org/zap" ) diff --git a/services/shhext/api.go b/services/shhext/api.go index 93ec75d5c..a0bae7cf5 100644 --- a/services/shhext/api.go +++ b/services/shhext/api.go @@ -18,7 +18,7 @@ import ( "github.com/status-im/status-go/mailserver" "github.com/status-im/status-go/params" "github.com/status-im/status-go/services/shhext/mailservers" - "github.com/status-im/status-go/whisper" + "github.com/status-im/status-go/whisper/v6" gethbridge "github.com/status-im/status-go/eth-node/bridge/geth" "github.com/status-im/status-go/eth-node/crypto" diff --git a/services/shhext/service_test.go b/services/shhext/service_test.go index 7a185e5fb..c2a60f5f7 100644 --- a/services/shhext/service_test.go +++ b/services/shhext/service_test.go @@ -26,7 +26,7 @@ import ( "github.com/status-im/status-go/sqlite" "github.com/status-im/status-go/t/helpers" "github.com/status-im/status-go/t/utils" - "github.com/status-im/status-go/whisper" + "github.com/status-im/status-go/whisper/v6" "github.com/stretchr/testify/suite" "github.com/syndtr/goleveldb/leveldb" "github.com/syndtr/goleveldb/leveldb/storage" diff --git a/t/benchmarks/mailserver_test.go b/t/benchmarks/mailserver_test.go index 1a871a4f2..8cd324f73 100644 --- a/t/benchmarks/mailserver_test.go +++ b/t/benchmarks/mailserver_test.go @@ -13,7 +13,7 @@ import ( "github.com/status-im/status-go/params" "github.com/status-im/status-go/services/nodebridge" "github.com/status-im/status-go/services/shhext" - "github.com/status-im/status-go/whisper" + "github.com/status-im/status-go/whisper/v6" "github.com/stretchr/testify/require" ) diff --git a/t/benchmarks/messages_test.go b/t/benchmarks/messages_test.go index d1a5b27e0..59252d8dd 100644 --- a/t/benchmarks/messages_test.go +++ b/t/benchmarks/messages_test.go @@ -7,7 +7,7 @@ import ( "testing" "github.com/ethereum/go-ethereum/node" - "github.com/status-im/status-go/whisper" + "github.com/status-im/status-go/whisper/v6" "github.com/stretchr/testify/require" ) diff --git a/t/benchmarks/utils_test.go b/t/benchmarks/utils_test.go index c740c8d09..19e0c8d71 100644 --- a/t/benchmarks/utils_test.go +++ b/t/benchmarks/utils_test.go @@ -8,7 +8,7 @@ import ( "github.com/ethereum/go-ethereum/p2p" "github.com/ethereum/go-ethereum/p2p/enode" "github.com/ethereum/go-ethereum/p2p/nat" - "github.com/status-im/status-go/whisper" + "github.com/status-im/status-go/whisper/v6" ) var ( diff --git a/t/e2e/node/manager_test.go b/t/e2e/node/manager_test.go index 817d63b98..62e6a6e9b 100644 --- a/t/e2e/node/manager_test.go +++ b/t/e2e/node/manager_test.go @@ -10,7 +10,7 @@ import ( "github.com/ethereum/go-ethereum/rpc" "github.com/status-im/status-go/node" "github.com/status-im/status-go/params" - "github.com/status-im/status-go/whisper" + "github.com/status-im/status-go/whisper/v6" "github.com/status-im/status-go/t/e2e" . "github.com/status-im/status-go/t/utils" diff --git a/t/e2e/suites.go b/t/e2e/suites.go index cf08d9723..b66dd154d 100644 --- a/t/e2e/suites.go +++ b/t/e2e/suites.go @@ -3,7 +3,7 @@ package e2e import ( "github.com/ethereum/go-ethereum/log" - "github.com/status-im/status-go/whisper" + "github.com/status-im/status-go/whisper/v6" "github.com/status-im/status-go/api" "github.com/status-im/status-go/multiaccounts" diff --git a/t/e2e/whisper/whisper_mailbox_test.go b/t/e2e/whisper/whisper_mailbox_test.go index c79a6ad8a..51e046d17 100644 --- a/t/e2e/whisper/whisper_mailbox_test.go +++ b/t/e2e/whisper/whisper_mailbox_test.go @@ -24,7 +24,7 @@ import ( "github.com/status-im/status-go/services/shhext" "github.com/status-im/status-go/t/helpers" "github.com/status-im/status-go/t/utils" - "github.com/status-im/status-go/whisper" + "github.com/status-im/status-go/whisper/v6" "github.com/stretchr/testify/suite" "golang.org/x/crypto/sha3" ) diff --git a/t/e2e/whisper/whisper_test.go b/t/e2e/whisper/whisper_test.go index 9dc1c8309..ce569f2b0 100644 --- a/t/e2e/whisper/whisper_test.go +++ b/t/e2e/whisper/whisper_test.go @@ -11,7 +11,7 @@ import ( "github.com/status-im/status-go/account" e2e "github.com/status-im/status-go/t/e2e" . "github.com/status-im/status-go/t/utils" - "github.com/status-im/status-go/whisper" + "github.com/status-im/status-go/whisper/v6" "github.com/stretchr/testify/suite" ) diff --git a/vendor/github.com/status-im/status-go/eth-node/bridge/geth/envelope.go b/vendor/github.com/status-im/status-go/eth-node/bridge/geth/envelope.go index 9c7e738ea..884760b06 100644 --- a/vendor/github.com/status-im/status-go/eth-node/bridge/geth/envelope.go +++ b/vendor/github.com/status-im/status-go/eth-node/bridge/geth/envelope.go @@ -2,7 +2,7 @@ package gethbridge import ( "github.com/status-im/status-go/eth-node/types" - "github.com/status-im/status-go/whisper" + "github.com/status-im/status-go/whisper/v6" ) type gethEnvelopeWrapper struct { diff --git a/vendor/github.com/status-im/status-go/eth-node/bridge/geth/envelope_error.go b/vendor/github.com/status-im/status-go/eth-node/bridge/geth/envelope_error.go index a6364617e..5a8edf257 100644 --- a/vendor/github.com/status-im/status-go/eth-node/bridge/geth/envelope_error.go +++ b/vendor/github.com/status-im/status-go/eth-node/bridge/geth/envelope_error.go @@ -2,7 +2,7 @@ package gethbridge import ( "github.com/status-im/status-go/eth-node/types" - "github.com/status-im/status-go/whisper" + "github.com/status-im/status-go/whisper/v6" ) // NewGethEnvelopeErrorWrapper returns a types.EnvelopeError object that mimics Geth's EnvelopeError diff --git a/vendor/github.com/status-im/status-go/eth-node/bridge/geth/envelope_event.go b/vendor/github.com/status-im/status-go/eth-node/bridge/geth/envelope_event.go index dc4b9b82d..9836987a6 100644 --- a/vendor/github.com/status-im/status-go/eth-node/bridge/geth/envelope_event.go +++ b/vendor/github.com/status-im/status-go/eth-node/bridge/geth/envelope_event.go @@ -2,7 +2,7 @@ package gethbridge import ( "github.com/status-im/status-go/eth-node/types" - "github.com/status-im/status-go/whisper" + "github.com/status-im/status-go/whisper/v6" ) // NewGethEnvelopeEventWrapper returns a types.EnvelopeEvent object that mimics Geth's EnvelopeEvent diff --git a/vendor/github.com/status-im/status-go/eth-node/bridge/geth/filter.go b/vendor/github.com/status-im/status-go/eth-node/bridge/geth/filter.go index 865c320c3..914e17df8 100644 --- a/vendor/github.com/status-im/status-go/eth-node/bridge/geth/filter.go +++ b/vendor/github.com/status-im/status-go/eth-node/bridge/geth/filter.go @@ -2,7 +2,7 @@ package gethbridge import ( "github.com/status-im/status-go/eth-node/types" - "github.com/status-im/status-go/whisper" + "github.com/status-im/status-go/whisper/v6" ) type gethFilterWrapper struct { diff --git a/vendor/github.com/status-im/status-go/eth-node/bridge/geth/mailserver_response.go b/vendor/github.com/status-im/status-go/eth-node/bridge/geth/mailserver_response.go index 4a4fd2ce2..01cbb30a2 100644 --- a/vendor/github.com/status-im/status-go/eth-node/bridge/geth/mailserver_response.go +++ b/vendor/github.com/status-im/status-go/eth-node/bridge/geth/mailserver_response.go @@ -2,7 +2,7 @@ package gethbridge import ( "github.com/status-im/status-go/eth-node/types" - "github.com/status-im/status-go/whisper" + "github.com/status-im/status-go/whisper/v6" ) // NewGethMailServerResponseWrapper returns a types.MailServerResponse object that mimics Geth's MailServerResponse diff --git a/vendor/github.com/status-im/status-go/eth-node/bridge/geth/node.go b/vendor/github.com/status-im/status-go/eth-node/bridge/geth/node.go index 020f3c85d..727df926f 100644 --- a/vendor/github.com/status-im/status-go/eth-node/bridge/geth/node.go +++ b/vendor/github.com/status-im/status-go/eth-node/bridge/geth/node.go @@ -5,7 +5,7 @@ import ( gethens "github.com/status-im/status-go/eth-node/bridge/geth/ens" "github.com/status-im/status-go/eth-node/types" enstypes "github.com/status-im/status-go/eth-node/types/ens" - "github.com/status-im/status-go/whisper" + "github.com/status-im/status-go/whisper/v6" "go.uber.org/zap" ) diff --git a/vendor/github.com/status-im/status-go/eth-node/bridge/geth/public_whisper_api.go b/vendor/github.com/status-im/status-go/eth-node/bridge/geth/public_whisper_api.go index 99bc3689b..d26ba6dc4 100644 --- a/vendor/github.com/status-im/status-go/eth-node/bridge/geth/public_whisper_api.go +++ b/vendor/github.com/status-im/status-go/eth-node/bridge/geth/public_whisper_api.go @@ -5,7 +5,7 @@ import ( "github.com/ethereum/go-ethereum/common/hexutil" "github.com/status-im/status-go/eth-node/types" - "github.com/status-im/status-go/whisper" + "github.com/status-im/status-go/whisper/v6" ) type gethPublicWhisperAPIWrapper struct { diff --git a/vendor/github.com/status-im/status-go/eth-node/bridge/geth/syncevent_response.go b/vendor/github.com/status-im/status-go/eth-node/bridge/geth/syncevent_response.go index 09eea583c..e9969a0eb 100644 --- a/vendor/github.com/status-im/status-go/eth-node/bridge/geth/syncevent_response.go +++ b/vendor/github.com/status-im/status-go/eth-node/bridge/geth/syncevent_response.go @@ -2,7 +2,7 @@ package gethbridge import ( "github.com/status-im/status-go/eth-node/types" - "github.com/status-im/status-go/whisper" + "github.com/status-im/status-go/whisper/v6" ) // NewGethSyncEventResponseWrapper returns a types.SyncEventResponse object that mimics Geth's SyncEventResponse diff --git a/vendor/github.com/status-im/status-go/eth-node/bridge/geth/syncmailrequest.go b/vendor/github.com/status-im/status-go/eth-node/bridge/geth/syncmailrequest.go index a8ad76b0b..1cb4af454 100644 --- a/vendor/github.com/status-im/status-go/eth-node/bridge/geth/syncmailrequest.go +++ b/vendor/github.com/status-im/status-go/eth-node/bridge/geth/syncmailrequest.go @@ -2,7 +2,7 @@ package gethbridge import ( "github.com/status-im/status-go/eth-node/types" - "github.com/status-im/status-go/whisper" + "github.com/status-im/status-go/whisper/v6" ) // GetGethSyncMailRequestFrom converts a whisper SyncMailRequest struct from a SyncMailRequest struct diff --git a/vendor/github.com/status-im/status-go/eth-node/bridge/geth/whisper.go b/vendor/github.com/status-im/status-go/eth-node/bridge/geth/whisper.go index 009884f54..1780cd68e 100644 --- a/vendor/github.com/status-im/status-go/eth-node/bridge/geth/whisper.go +++ b/vendor/github.com/status-im/status-go/eth-node/bridge/geth/whisper.go @@ -5,7 +5,7 @@ import ( "time" "github.com/status-im/status-go/eth-node/types" - "github.com/status-im/status-go/whisper" + "github.com/status-im/status-go/whisper/v6" ) type gethWhisperWrapper struct { diff --git a/vendor/github.com/status-im/status-go/protocol/go.mod b/vendor/github.com/status-im/status-go/protocol/go.mod index ba29bd3fe..4d0a71da3 100644 --- a/vendor/github.com/status-im/status-go/protocol/go.mod +++ b/vendor/github.com/status-im/status-go/protocol/go.mod @@ -8,7 +8,7 @@ replace github.com/gomarkdown/markdown => github.com/status-im/markdown v0.0.0-2 replace github.com/status-im/status-go/eth-node => ../eth-node -replace github.com/status-im/status-go/whisper => ../whisper +replace github.com/status-im/status-go/whisper/v6 => ../whisper require ( github.com/cenkalti/backoff/v3 v3.0.0 @@ -25,7 +25,7 @@ require ( github.com/status-im/doubleratchet v3.0.0+incompatible github.com/status-im/migrate/v4 v4.6.2-status.2 github.com/status-im/status-go/eth-node v0.0.0-20191120100713-5053b0b6835b - github.com/status-im/status-go/whisper v1.0.0 + github.com/status-im/status-go/whisper/v6 v6.0.0 github.com/stretchr/testify v1.4.0 github.com/vacp2p/mvds v0.0.23 go.uber.org/zap v1.13.0 diff --git a/vendor/github.com/status-im/status-go/whisper/api.go b/vendor/github.com/status-im/status-go/whisper/v6/api.go similarity index 100% rename from vendor/github.com/status-im/status-go/whisper/api.go rename to vendor/github.com/status-im/status-go/whisper/v6/api.go diff --git a/vendor/github.com/status-im/status-go/whisper/config.go b/vendor/github.com/status-im/status-go/whisper/v6/config.go similarity index 100% rename from vendor/github.com/status-im/status-go/whisper/config.go rename to vendor/github.com/status-im/status-go/whisper/v6/config.go diff --git a/vendor/github.com/status-im/status-go/whisper/doc.go b/vendor/github.com/status-im/status-go/whisper/v6/doc.go similarity index 100% rename from vendor/github.com/status-im/status-go/whisper/doc.go rename to vendor/github.com/status-im/status-go/whisper/v6/doc.go diff --git a/vendor/github.com/status-im/status-go/whisper/envelope.go b/vendor/github.com/status-im/status-go/whisper/v6/envelope.go similarity index 100% rename from vendor/github.com/status-im/status-go/whisper/envelope.go rename to vendor/github.com/status-im/status-go/whisper/v6/envelope.go diff --git a/vendor/github.com/status-im/status-go/whisper/events.go b/vendor/github.com/status-im/status-go/whisper/v6/events.go similarity index 100% rename from vendor/github.com/status-im/status-go/whisper/events.go rename to vendor/github.com/status-im/status-go/whisper/v6/events.go diff --git a/vendor/github.com/status-im/status-go/whisper/filter.go b/vendor/github.com/status-im/status-go/whisper/v6/filter.go similarity index 100% rename from vendor/github.com/status-im/status-go/whisper/filter.go rename to vendor/github.com/status-im/status-go/whisper/v6/filter.go diff --git a/vendor/github.com/status-im/status-go/whisper/fuzz.go b/vendor/github.com/status-im/status-go/whisper/v6/fuzz.go similarity index 100% rename from vendor/github.com/status-im/status-go/whisper/fuzz.go rename to vendor/github.com/status-im/status-go/whisper/v6/fuzz.go diff --git a/vendor/github.com/status-im/status-go/whisper/gen_criteria_json.go b/vendor/github.com/status-im/status-go/whisper/v6/gen_criteria_json.go similarity index 100% rename from vendor/github.com/status-im/status-go/whisper/gen_criteria_json.go rename to vendor/github.com/status-im/status-go/whisper/v6/gen_criteria_json.go diff --git a/vendor/github.com/status-im/status-go/whisper/gen_message_json.go b/vendor/github.com/status-im/status-go/whisper/v6/gen_message_json.go similarity index 100% rename from vendor/github.com/status-im/status-go/whisper/gen_message_json.go rename to vendor/github.com/status-im/status-go/whisper/v6/gen_message_json.go diff --git a/vendor/github.com/status-im/status-go/whisper/gen_newmessage_json.go b/vendor/github.com/status-im/status-go/whisper/v6/gen_newmessage_json.go similarity index 100% rename from vendor/github.com/status-im/status-go/whisper/gen_newmessage_json.go rename to vendor/github.com/status-im/status-go/whisper/v6/gen_newmessage_json.go diff --git a/vendor/github.com/status-im/status-go/whisper/go.mod b/vendor/github.com/status-im/status-go/whisper/v6/go.mod similarity index 100% rename from vendor/github.com/status-im/status-go/whisper/go.mod rename to vendor/github.com/status-im/status-go/whisper/v6/go.mod diff --git a/vendor/github.com/status-im/status-go/whisper/go.sum b/vendor/github.com/status-im/status-go/whisper/v6/go.sum similarity index 100% rename from vendor/github.com/status-im/status-go/whisper/go.sum rename to vendor/github.com/status-im/status-go/whisper/v6/go.sum diff --git a/vendor/github.com/status-im/status-go/whisper/mailserver_response.go b/vendor/github.com/status-im/status-go/whisper/v6/mailserver_response.go similarity index 100% rename from vendor/github.com/status-im/status-go/whisper/mailserver_response.go rename to vendor/github.com/status-im/status-go/whisper/v6/mailserver_response.go diff --git a/vendor/github.com/status-im/status-go/whisper/message.go b/vendor/github.com/status-im/status-go/whisper/v6/message.go similarity index 100% rename from vendor/github.com/status-im/status-go/whisper/message.go rename to vendor/github.com/status-im/status-go/whisper/v6/message.go diff --git a/vendor/github.com/status-im/status-go/whisper/metrics.go b/vendor/github.com/status-im/status-go/whisper/v6/metrics.go similarity index 100% rename from vendor/github.com/status-im/status-go/whisper/metrics.go rename to vendor/github.com/status-im/status-go/whisper/v6/metrics.go diff --git a/vendor/github.com/status-im/status-go/whisper/peer.go b/vendor/github.com/status-im/status-go/whisper/v6/peer.go similarity index 100% rename from vendor/github.com/status-im/status-go/whisper/peer.go rename to vendor/github.com/status-im/status-go/whisper/v6/peer.go diff --git a/vendor/github.com/status-im/status-go/whisper/rate_limiter.go b/vendor/github.com/status-im/status-go/whisper/v6/rate_limiter.go similarity index 100% rename from vendor/github.com/status-im/status-go/whisper/rate_limiter.go rename to vendor/github.com/status-im/status-go/whisper/v6/rate_limiter.go diff --git a/vendor/github.com/status-im/status-go/whisper/topic.go b/vendor/github.com/status-im/status-go/whisper/v6/topic.go similarity index 100% rename from vendor/github.com/status-im/status-go/whisper/topic.go rename to vendor/github.com/status-im/status-go/whisper/v6/topic.go diff --git a/vendor/github.com/status-im/status-go/whisper/whisper.go b/vendor/github.com/status-im/status-go/whisper/v6/whisper.go similarity index 100% rename from vendor/github.com/status-im/status-go/whisper/whisper.go rename to vendor/github.com/status-im/status-go/whisper/v6/whisper.go diff --git a/vendor/modules.txt b/vendor/modules.txt index 7b399f71f..0e23a256b 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -396,8 +396,8 @@ github.com/status-im/status-go/protocol/transport/whisper github.com/status-im/status-go/protocol/transport/whisper/migrations github.com/status-im/status-go/protocol/v1 github.com/status-im/status-go/protocol/zaputil -# github.com/status-im/status-go/whisper v1.0.0 => ./whisper -github.com/status-im/status-go/whisper +# github.com/status-im/status-go/whisper/v6 v6.0.0 => ./whisper +github.com/status-im/status-go/whisper/v6 # github.com/status-im/tcp-shaker v0.0.0-20191114194237-215893130501 github.com/status-im/tcp-shaker # github.com/steakknife/bloomfilter v0.0.0-20180922174646-6819c0d2a570