status-im
/
status-go
mirror of https://github.com/status-im/status-go.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Set Whisper version submodule to v6 (#1725)

This commit is contained in:
Adam Babik 2019-12-09 11:36:14 +01:00 committed by GitHub
parent 4ac4a61e20
commit a636f33109
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
70 changed files with 56 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
eth-node/bridge/geth/envelope.go
View File

@ -2,7 +2,7 @@ package gethbridge
import ( import (
"github.com/status-im/status-go/eth-node/types" "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 { type gethEnvelopeWrapper struct {

2
eth-node/bridge/geth/envelope_error.go
View File

@ -2,7 +2,7 @@ package gethbridge
import ( import (
"github.com/status-im/status-go/eth-node/types" "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 // NewGethEnvelopeErrorWrapper returns a types.EnvelopeError object that mimics Geth's EnvelopeError

2
eth-node/bridge/geth/envelope_event.go
View File

@ -2,7 +2,7 @@ package gethbridge
import ( import (
"github.com/status-im/status-go/eth-node/types" "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 // NewGethEnvelopeEventWrapper returns a types.EnvelopeEvent object that mimics Geth's EnvelopeEvent

2
eth-node/bridge/geth/filter.go
View File

@ -2,7 +2,7 @@ package gethbridge
import ( import (
"github.com/status-im/status-go/eth-node/types" "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 { type gethFilterWrapper struct {

2
eth-node/bridge/geth/mailserver_response.go
View File

@ -2,7 +2,7 @@ package gethbridge
import ( import (
"github.com/status-im/status-go/eth-node/types" "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 // NewGethMailServerResponseWrapper returns a types.MailServerResponse object that mimics Geth's MailServerResponse

2
eth-node/bridge/geth/node.go
View File

@ -5,7 +5,7 @@ import (
gethens "github.com/status-im/status-go/eth-node/bridge/geth/ens" gethens "github.com/status-im/status-go/eth-node/bridge/geth/ens"
"github.com/status-im/status-go/eth-node/types" "github.com/status-im/status-go/eth-node/types"
enstypes "github.com/status-im/status-go/eth-node/types/ens" 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" "go.uber.org/zap"
) )

2
eth-node/bridge/geth/public_whisper_api.go
View File

@ -5,7 +5,7 @@ import (
"github.com/ethereum/go-ethereum/common/hexutil" "github.com/ethereum/go-ethereum/common/hexutil"
"github.com/status-im/status-go/eth-node/types" "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 { type gethPublicWhisperAPIWrapper struct {

2
eth-node/bridge/geth/syncevent_response.go
View File

@ -2,7 +2,7 @@ package gethbridge
import ( import (
"github.com/status-im/status-go/eth-node/types" "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 // NewGethSyncEventResponseWrapper returns a types.SyncEventResponse object that mimics Geth's SyncEventResponse

2
eth-node/bridge/geth/syncmailrequest.go
View File

@ -2,7 +2,7 @@ package gethbridge
import ( import (
"github.com/status-im/status-go/eth-node/types" "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 // GetGethSyncMailRequestFrom converts a whisper SyncMailRequest struct from a SyncMailRequest struct

2
eth-node/bridge/geth/whisper.go
View File

@ -5,7 +5,7 @@ import (
"time" "time"
"github.com/status-im/status-go/eth-node/types" "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 { type gethWhisperWrapper struct {

4
eth-node/go.mod
View File

@ -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/extkeys => ../extkeys
replace github.com/status-im/status-go/whisper => ../whisper replace github.com/status-im/status-go/whisper/v6 => ../whisper
require ( require (
github.com/ethereum/go-ethereum v1.9.5 github.com/ethereum/go-ethereum v1.9.5
github.com/mattn/go-pointer v0.0.0-20190911064623-a0a44394634f github.com/mattn/go-pointer v0.0.0-20190911064623-a0a44394634f
github.com/status-im/doubleratchet v3.0.0+incompatible 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/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/stretchr/testify v1.4.0
github.com/wealdtech/go-ens/v3 v3.0.9 github.com/wealdtech/go-ens/v3 v3.0.9
go.uber.org/zap v1.13.0 go.uber.org/zap v1.13.0

1
eth-node/go.sum
View File

@ -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 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 h1:fBdIW9lB4Iz0n9khmH8w27SJ3QEJ7+IgjPEwGSZiFdE=
github.com/syndtr/goleveldb v1.0.0/go.mod h1:ZVVdQEZoIme9iO1Ch2Jdy24qqXrMMOU6lpPAyBWyWuQ= 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/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 h1:+t3w+KwLXO6154GNJY+qUtIxLTmFjfUmpguQT1OlOT8=
github.com/tyler-smith/go-bip39 v1.0.2/go.mod h1:sJ5fKU0s6JVwZjjcUEX2zFOnvq0ASQ2K9Zr6cf67kNs= github.com/tyler-smith/go-bip39 v1.0.2/go.mod h1:sJ5fKU0s6JVwZjjcUEX2zFOnvq0ASQ2K9Zr6cf67kNs=

4
go.mod
View File

@ -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/eth-node => ./eth-node
replace github.com/status-im/status-go/whisper => ./whisper replace github.com/status-im/status-go/whisper/v6 => ./whisper
require ( require (
github.com/beevik/ntp v0.2.0 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/eth-node v0.0.0-20191126161717-86bc127b3d0a
github.com/status-im/status-go/extkeys v1.0.0 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/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/status-im/tcp-shaker v0.0.0-20191114194237-215893130501
github.com/stretchr/testify v1.4.0 github.com/stretchr/testify v1.4.0
github.com/syndtr/goleveldb v1.0.0 github.com/syndtr/goleveldb v1.0.0

2
mailserver/cleaner_test.go
View File

@ -7,7 +7,7 @@ import (
"github.com/ethereum/go-ethereum/rlp" "github.com/ethereum/go-ethereum/rlp"
"github.com/status-im/status-go/eth-node/types" "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/stretchr/testify/require"
"github.com/syndtr/goleveldb/leveldb" "github.com/syndtr/goleveldb/leveldb"
"github.com/syndtr/goleveldb/leveldb/storage" "github.com/syndtr/goleveldb/leveldb/storage"

2
mailserver/mailserver.go
View File

@ -31,7 +31,7 @@ import (
"github.com/ethereum/go-ethereum/rlp" "github.com/ethereum/go-ethereum/rlp"
"github.com/status-im/status-go/eth-node/types" "github.com/status-im/status-go/eth-node/types"
"github.com/status-im/status-go/params" "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" prom "github.com/prometheus/client_golang/prometheus"
) )

2
mailserver/mailserver_db.go
View File

@ -3,7 +3,7 @@ package mailserver
import ( import (
"time" "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 // DB is an interface to abstract interactions with the db so that the mailserver

2
mailserver/mailserver_db_leveldb.go
View File

@ -8,7 +8,7 @@ import (
"github.com/ethereum/go-ethereum/rlp" "github.com/ethereum/go-ethereum/rlp"
"github.com/status-im/status-go/eth-node/types" "github.com/status-im/status-go/eth-node/types"
"github.com/status-im/status-go/params" "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"
"github.com/syndtr/goleveldb/leveldb/errors" "github.com/syndtr/goleveldb/leveldb/errors"
"github.com/syndtr/goleveldb/leveldb/iterator" "github.com/syndtr/goleveldb/leveldb/iterator"

2
mailserver/mailserver_db_postgres.go
View File

@ -16,7 +16,7 @@ import (
"github.com/ethereum/go-ethereum/log" "github.com/ethereum/go-ethereum/log"
"github.com/ethereum/go-ethereum/rlp" "github.com/ethereum/go-ethereum/rlp"
"github.com/status-im/status-go/eth-node/types" "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) { func NewPostgresDB(config *params.WhisperConfig) (*PostgresDB, error) {

2
mailserver/mailserver_test.go
View File

@ -34,7 +34,7 @@ import (
"github.com/ethereum/go-ethereum/rlp" "github.com/ethereum/go-ethereum/rlp"
"github.com/status-im/status-go/eth-node/types" "github.com/status-im/status-go/eth-node/types"
"github.com/status-im/status-go/params" "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" "github.com/stretchr/testify/suite"
) )

2
node/node.go
View File

@ -34,7 +34,7 @@ import (
"github.com/status-im/status-go/services/status" "github.com/status-im/status-go/services/status"
"github.com/status-im/status-go/static" "github.com/status-im/status-go/static"
"github.com/status-im/status-go/timesource" "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" "github.com/syndtr/goleveldb/leveldb"
) )

2
node/node_api_test.go
View File

@ -6,7 +6,7 @@ import (
"github.com/ethereum/go-ethereum/accounts" "github.com/ethereum/go-ethereum/accounts"
"github.com/status-im/status-go/params" "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" "github.com/stretchr/testify/require"
) )

2
node/status_node.go
View File

@ -20,7 +20,7 @@ import (
"github.com/ethereum/go-ethereum/p2p/enode" "github.com/ethereum/go-ethereum/p2p/enode"
"github.com/ethereum/go-ethereum/p2p/enr" "github.com/ethereum/go-ethereum/p2p/enr"
ma "github.com/multiformats/go-multiaddr" 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/syndtr/goleveldb/leveldb"
"github.com/status-im/status-go/db" "github.com/status-im/status-go/db"

2
node/status_node_test.go
View File

@ -17,7 +17,7 @@ import (
gethnode "github.com/ethereum/go-ethereum/node" gethnode "github.com/ethereum/go-ethereum/node"
"github.com/ethereum/go-ethereum/p2p" "github.com/ethereum/go-ethereum/p2p"
"github.com/ethereum/go-ethereum/p2p/enode" "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/discovery"
"github.com/status-im/status-go/params" "github.com/status-im/status-go/params"

2
params/config.go
View File

@ -17,7 +17,7 @@ import (
"github.com/ethereum/go-ethereum/p2p/discv5" "github.com/ethereum/go-ethereum/p2p/discv5"
"github.com/ethereum/go-ethereum/params" "github.com/ethereum/go-ethereum/params"
"github.com/status-im/status-go/static" "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" validator "gopkg.in/go-playground/validator.v9"
) )

2
peers/peerpool_test.go
View File

@ -25,7 +25,7 @@ import (
"github.com/status-im/status-go/discovery" "github.com/status-im/status-go/discovery"
"github.com/status-im/status-go/params" "github.com/status-im/status-go/params"
"github.com/status-im/status-go/signal" "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 { type PeerPoolSimulationSuite struct {

2
peers/topicpool_test.go
View File

@ -12,7 +12,7 @@ import (
"github.com/ethereum/go-ethereum/p2p/enode" "github.com/ethereum/go-ethereum/p2p/enode"
"github.com/status-im/status-go/params" "github.com/status-im/status-go/params"
"github.com/status-im/status-go/t/helpers" "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/require"
"github.com/stretchr/testify/suite" "github.com/stretchr/testify/suite"
) )

4
protocol/go.mod
View File

@ -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/eth-node => ../eth-node
replace github.com/status-im/status-go/whisper => ../whisper replace github.com/status-im/status-go/whisper/v6 => ../whisper
require ( require (
github.com/cenkalti/backoff/v3 v3.0.0 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/doubleratchet v3.0.0+incompatible
github.com/status-im/migrate/v4 v4.6.2-status.2 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/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/stretchr/testify v1.4.0
github.com/vacp2p/mvds v0.0.23 github.com/vacp2p/mvds v0.0.23
go.uber.org/zap v1.13.0 go.uber.org/zap v1.13.0

2
protocol/message_processor_test.go
View File

@ -21,7 +21,7 @@ import (
"github.com/status-im/status-go/protocol/sqlite" "github.com/status-im/status-go/protocol/sqlite"
transport "github.com/status-im/status-go/protocol/transport/whisper" transport "github.com/status-im/status-go/protocol/transport/whisper"
v1protocol "github.com/status-im/status-go/protocol/v1" 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" datasyncproto "github.com/vacp2p/mvds/protobuf"
) )

2
protocol/messenger_test.go
View File

@ -21,7 +21,7 @@ import (
"github.com/status-im/status-go/protocol/protobuf" "github.com/status-im/status-go/protocol/protobuf"
"github.com/status-im/status-go/protocol/sqlite" "github.com/status-im/status-go/protocol/sqlite"
"github.com/status-im/status-go/protocol/tt" "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" "github.com/stretchr/testify/suite"
"go.uber.org/zap" "go.uber.org/zap"
) )

2
protocol/transport/whisper/filter_test.go
View File

@ -14,7 +14,7 @@ import (
_ "github.com/mutecomm/go-sqlcipher" _ "github.com/mutecomm/go-sqlcipher"
"github.com/status-im/status-go/eth-node/crypto" "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" "github.com/stretchr/testify/suite"
"go.uber.org/zap" "go.uber.org/zap"
) )

2
services/shhext/api.go
View File

@ -18,7 +18,7 @@ import (
"github.com/status-im/status-go/mailserver" "github.com/status-im/status-go/mailserver"
"github.com/status-im/status-go/params" "github.com/status-im/status-go/params"
"github.com/status-im/status-go/services/shhext/mailservers" "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" gethbridge "github.com/status-im/status-go/eth-node/bridge/geth"
"github.com/status-im/status-go/eth-node/crypto" "github.com/status-im/status-go/eth-node/crypto"

2
services/shhext/service_test.go
View File

@ -26,7 +26,7 @@ import (
"github.com/status-im/status-go/sqlite" "github.com/status-im/status-go/sqlite"
"github.com/status-im/status-go/t/helpers" "github.com/status-im/status-go/t/helpers"
"github.com/status-im/status-go/t/utils" "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/stretchr/testify/suite"
"github.com/syndtr/goleveldb/leveldb" "github.com/syndtr/goleveldb/leveldb"
"github.com/syndtr/goleveldb/leveldb/storage" "github.com/syndtr/goleveldb/leveldb/storage"

2
t/benchmarks/mailserver_test.go
View File

@ -13,7 +13,7 @@ import (
"github.com/status-im/status-go/params" "github.com/status-im/status-go/params"
"github.com/status-im/status-go/services/nodebridge" "github.com/status-im/status-go/services/nodebridge"
"github.com/status-im/status-go/services/shhext" "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" "github.com/stretchr/testify/require"
) )

2
t/benchmarks/messages_test.go
View File

@ -7,7 +7,7 @@ import (
"testing" "testing"
"github.com/ethereum/go-ethereum/node" "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" "github.com/stretchr/testify/require"
) )

2
t/benchmarks/utils_test.go
View File

@ -8,7 +8,7 @@ import (
"github.com/ethereum/go-ethereum/p2p" "github.com/ethereum/go-ethereum/p2p"
"github.com/ethereum/go-ethereum/p2p/enode" "github.com/ethereum/go-ethereum/p2p/enode"
"github.com/ethereum/go-ethereum/p2p/nat" "github.com/ethereum/go-ethereum/p2p/nat"
"github.com/status-im/status-go/whisper" "github.com/status-im/status-go/whisper/v6"
) )
var ( var (

2
t/e2e/node/manager_test.go
View File

@ -10,7 +10,7 @@ import (
"github.com/ethereum/go-ethereum/rpc" "github.com/ethereum/go-ethereum/rpc"
"github.com/status-im/status-go/node" "github.com/status-im/status-go/node"
"github.com/status-im/status-go/params" "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/e2e"
. "github.com/status-im/status-go/t/utils" . "github.com/status-im/status-go/t/utils"

2
t/e2e/suites.go
View File

@ -3,7 +3,7 @@ package e2e
import ( import (
"github.com/ethereum/go-ethereum/log" "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/api"
"github.com/status-im/status-go/multiaccounts" "github.com/status-im/status-go/multiaccounts"

2
t/e2e/whisper/whisper_mailbox_test.go
View File

@ -24,7 +24,7 @@ import (
"github.com/status-im/status-go/services/shhext" "github.com/status-im/status-go/services/shhext"
"github.com/status-im/status-go/t/helpers" "github.com/status-im/status-go/t/helpers"
"github.com/status-im/status-go/t/utils" "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/stretchr/testify/suite"
"golang.org/x/crypto/sha3" "golang.org/x/crypto/sha3"
) )

2
t/e2e/whisper/whisper_test.go
View File

@ -11,7 +11,7 @@ import (
"github.com/status-im/status-go/account" "github.com/status-im/status-go/account"
e2e "github.com/status-im/status-go/t/e2e" e2e "github.com/status-im/status-go/t/e2e"
. "github.com/status-im/status-go/t/utils" . "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/stretchr/testify/suite"
) )

2
vendor/github.com/status-im/status-go/eth-node/bridge/geth/envelope.go generated vendored
View File

@ -2,7 +2,7 @@ package gethbridge
import ( import (
"github.com/status-im/status-go/eth-node/types" "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 { type gethEnvelopeWrapper struct {

2
vendor/github.com/status-im/status-go/eth-node/bridge/geth/envelope_error.go generated vendored
View File

@ -2,7 +2,7 @@ package gethbridge
import ( import (
"github.com/status-im/status-go/eth-node/types" "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 // NewGethEnvelopeErrorWrapper returns a types.EnvelopeError object that mimics Geth's EnvelopeError

2
vendor/github.com/status-im/status-go/eth-node/bridge/geth/envelope_event.go generated vendored
View File

@ -2,7 +2,7 @@ package gethbridge
import ( import (
"github.com/status-im/status-go/eth-node/types" "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 // NewGethEnvelopeEventWrapper returns a types.EnvelopeEvent object that mimics Geth's EnvelopeEvent

2
vendor/github.com/status-im/status-go/eth-node/bridge/geth/filter.go generated vendored
View File

@ -2,7 +2,7 @@ package gethbridge
import ( import (
"github.com/status-im/status-go/eth-node/types" "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 { type gethFilterWrapper struct {

2
vendor/github.com/status-im/status-go/eth-node/bridge/geth/mailserver_response.go generated vendored
View File

@ -2,7 +2,7 @@ package gethbridge
import ( import (
"github.com/status-im/status-go/eth-node/types" "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 // NewGethMailServerResponseWrapper returns a types.MailServerResponse object that mimics Geth's MailServerResponse

2
vendor/github.com/status-im/status-go/eth-node/bridge/geth/node.go generated vendored
View File

@ -5,7 +5,7 @@ import (
gethens "github.com/status-im/status-go/eth-node/bridge/geth/ens" gethens "github.com/status-im/status-go/eth-node/bridge/geth/ens"
"github.com/status-im/status-go/eth-node/types" "github.com/status-im/status-go/eth-node/types"
enstypes "github.com/status-im/status-go/eth-node/types/ens" 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" "go.uber.org/zap"
) )

2
vendor/github.com/status-im/status-go/eth-node/bridge/geth/public_whisper_api.go generated vendored
View File

@ -5,7 +5,7 @@ import (
"github.com/ethereum/go-ethereum/common/hexutil" "github.com/ethereum/go-ethereum/common/hexutil"
"github.com/status-im/status-go/eth-node/types" "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 { type gethPublicWhisperAPIWrapper struct {

2
vendor/github.com/status-im/status-go/eth-node/bridge/geth/syncevent_response.go generated vendored
View File

@ -2,7 +2,7 @@ package gethbridge
import ( import (
"github.com/status-im/status-go/eth-node/types" "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 // NewGethSyncEventResponseWrapper returns a types.SyncEventResponse object that mimics Geth's SyncEventResponse

2
vendor/github.com/status-im/status-go/eth-node/bridge/geth/syncmailrequest.go generated vendored
View File

@ -2,7 +2,7 @@ package gethbridge
import ( import (
"github.com/status-im/status-go/eth-node/types" "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 // GetGethSyncMailRequestFrom converts a whisper SyncMailRequest struct from a SyncMailRequest struct

2
vendor/github.com/status-im/status-go/eth-node/bridge/geth/whisper.go generated vendored
View File

@ -5,7 +5,7 @@ import (
"time" "time"
"github.com/status-im/status-go/eth-node/types" "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 { type gethWhisperWrapper struct {

4
vendor/github.com/status-im/status-go/protocol/go.mod generated vendored
View File

@ -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/eth-node => ../eth-node
replace github.com/status-im/status-go/whisper => ../whisper replace github.com/status-im/status-go/whisper/v6 => ../whisper
require ( require (
github.com/cenkalti/backoff/v3 v3.0.0 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/doubleratchet v3.0.0+incompatible
github.com/status-im/migrate/v4 v4.6.2-status.2 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/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/stretchr/testify v1.4.0
github.com/vacp2p/mvds v0.0.23 github.com/vacp2p/mvds v0.0.23
go.uber.org/zap v1.13.0 go.uber.org/zap v1.13.0

0
vendor/github.com/status-im/status-go/whisper/api.go → vendor/github.com/status-im/status-go/whisper/v6/api.go generated vendored
View File

0
vendor/github.com/status-im/status-go/whisper/config.go → vendor/github.com/status-im/status-go/whisper/v6/config.go generated vendored
View File

0
vendor/github.com/status-im/status-go/whisper/doc.go → vendor/github.com/status-im/status-go/whisper/v6/doc.go generated vendored
View File

0
vendor/github.com/status-im/status-go/whisper/envelope.go → vendor/github.com/status-im/status-go/whisper/v6/envelope.go generated vendored
View File

0
vendor/github.com/status-im/status-go/whisper/events.go → vendor/github.com/status-im/status-go/whisper/v6/events.go generated vendored
View File

0
vendor/github.com/status-im/status-go/whisper/filter.go → vendor/github.com/status-im/status-go/whisper/v6/filter.go generated vendored
View File

0
vendor/github.com/status-im/status-go/whisper/fuzz.go → vendor/github.com/status-im/status-go/whisper/v6/fuzz.go generated vendored
View File

0
vendor/github.com/status-im/status-go/whisper/gen_criteria_json.go → vendor/github.com/status-im/status-go/whisper/v6/gen_criteria_json.go generated vendored
View File

0
vendor/github.com/status-im/status-go/whisper/gen_message_json.go → vendor/github.com/status-im/status-go/whisper/v6/gen_message_json.go generated vendored
View File

0
vendor/github.com/status-im/status-go/whisper/gen_newmessage_json.go → vendor/github.com/status-im/status-go/whisper/v6/gen_newmessage_json.go generated vendored
View File

0
vendor/github.com/status-im/status-go/whisper/go.mod → vendor/github.com/status-im/status-go/whisper/v6/go.mod generated vendored
View File

0
vendor/github.com/status-im/status-go/whisper/go.sum → vendor/github.com/status-im/status-go/whisper/v6/go.sum generated vendored
View File

0
vendor/github.com/status-im/status-go/whisper/mailserver_response.go → vendor/github.com/status-im/status-go/whisper/v6/mailserver_response.go generated vendored
View File

0
vendor/github.com/status-im/status-go/whisper/message.go → vendor/github.com/status-im/status-go/whisper/v6/message.go generated vendored
View File

0
vendor/github.com/status-im/status-go/whisper/metrics.go → vendor/github.com/status-im/status-go/whisper/v6/metrics.go generated vendored
View File

0
vendor/github.com/status-im/status-go/whisper/peer.go → vendor/github.com/status-im/status-go/whisper/v6/peer.go generated vendored
View File

0
vendor/github.com/status-im/status-go/whisper/rate_limiter.go → vendor/github.com/status-im/status-go/whisper/v6/rate_limiter.go generated vendored
View File

0
vendor/github.com/status-im/status-go/whisper/topic.go → vendor/github.com/status-im/status-go/whisper/v6/topic.go generated vendored
View File

0
vendor/github.com/status-im/status-go/whisper/whisper.go → vendor/github.com/status-im/status-go/whisper/v6/whisper.go generated vendored
View File

4
vendor/modules.txt vendored
View File

@ -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/transport/whisper/migrations
github.com/status-im/status-go/protocol/v1 github.com/status-im/status-go/protocol/v1
github.com/status-im/status-go/protocol/zaputil 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/v6 v6.0.0 => ./whisper
github.com/status-im/status-go/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 v0.0.0-20191114194237-215893130501
github.com/status-im/tcp-shaker github.com/status-im/tcp-shaker
# github.com/steakknife/bloomfilter v0.0.0-20180922174646-6819c0d2a570 # github.com/steakknife/bloomfilter v0.0.0-20180922174646-6819c0d2a570