Use status-protocol-go/bridge/geth (#1638)

* Use status-protocol-go/bridge/geth
status-im · Oct 14, 2019 · c874960 · c874960
1 parent 4fe3179
commit c874960
Show file tree

Hide file tree

Showing 26 changed files with 195 additions and 45 deletions.
diff --git a/cmd/node-canary/main.go b/cmd/node-canary/main.go
@@ -21,7 +21,7 @@ import (
 	"github.com/status-im/status-go/rpc"
 	"github.com/status-im/status-go/services/shhext"
 	"github.com/status-im/status-go/t/helpers"
-	"github.com/status-im/status-protocol-go/transport/whisper/gethbridge"
+	gethbridge "github.com/status-im/status-protocol-go/bridge/geth"
 	statusproto "github.com/status-im/status-protocol-go/types"
 	"golang.org/x/crypto/sha3"
 	"golang.org/x/crypto/ssh/terminal"

diff --git a/go.mod b/go.mod
@@ -9,7 +9,7 @@ replace github.com/NaySoftware/go-fcm => github.com/status-im/go-fcm v1.0.0-stat
 require (
 	github.com/NaySoftware/go-fcm v0.0.0-00010101000000-000000000000
 	github.com/beevik/ntp v0.2.0
-	github.com/btcsuite/btcd v0.0.0-20190824003749-130ea5bddde3
+	github.com/btcsuite/btcd v0.0.0-20191011042131-c3151ef50de9
 	github.com/btcsuite/btcutil v0.0.0-20190425235716-9e5f4b9a998d
 	github.com/ethereum/go-ethereum v1.9.5
 	github.com/gballet/go-libpcsclite v0.0.0-20190607065134-2772fd86a8ff // indirect
@@ -31,7 +31,7 @@ require (
 	github.com/status-im/keycard-go v0.0.0-20190424133014-d95853db0f48 // indirect
 	github.com/status-im/migrate/v4 v4.3.1-status.0.20190822050738-a9d340ec8fb7
 	github.com/status-im/rendezvous v1.3.0
-	github.com/status-im/status-protocol-go v0.2.3-0.20191010161351-fd48aa752717
+	github.com/status-im/status-protocol-go v0.3.1
 	github.com/status-im/whisper v1.5.1
 	github.com/stretchr/testify v1.4.0
 	github.com/syndtr/goleveldb v1.0.0

diff --git a/go.sum b/go.sum
@@ -49,6 +49,8 @@ github.com/btcsuite/btcd v0.0.0-20190213025234-306aecffea32/go.mod h1:DrZx5ec/dm
 github.com/btcsuite/btcd v0.0.0-20190523000118-16327141da8c/go.mod h1:3J08xEfcugPacsc34/LKRU2yO7YmuT8yt28J8k2+rrI=
 github.com/btcsuite/btcd v0.0.0-20190824003749-130ea5bddde3 h1:A/EVblehb75cUgXA5njHPn0kLAsykn6mJGz7rnmW5W0=
 github.com/btcsuite/btcd v0.0.0-20190824003749-130ea5bddde3/go.mod h1:3J08xEfcugPacsc34/LKRU2yO7YmuT8yt28J8k2+rrI=
+github.com/btcsuite/btcd v0.0.0-20191011042131-c3151ef50de9 h1:wYYywOGk2jIXV+yt1zIiKl64c/4WLKMh4KET7K8FXFY=
+github.com/btcsuite/btcd v0.0.0-20191011042131-c3151ef50de9/go.mod h1:wVuoA8VJLEcwgqHBwHmzLRazpKxTv13Px/pDuV7OomQ=
 github.com/btcsuite/btclog v0.0.0-20170628155309-84c8d2346e9f/go.mod h1:TdznJufoqS23FtqVCzL0ZqgP5MqXbb4fg/WgDys70nA=
 github.com/btcsuite/btcutil v0.0.0-20190207003914-4c204d697803/go.mod h1:+5NJ2+qvTyV9exUAL/rxXi3DcLg2Ts+ymUAY5y4NvMg=
 github.com/btcsuite/btcutil v0.0.0-20190425235716-9e5f4b9a998d h1:yJzD/yFppdVCf6ApMkVy8cUxV0XrxdP9rVf6D87/Mng=
@@ -558,8 +560,8 @@ github.com/status-im/migrate/v4 v4.3.1-status.0.20190822050738-a9d340ec8fb7 h1:g
 github.com/status-im/migrate/v4 v4.3.1-status.0.20190822050738-a9d340ec8fb7/go.mod h1:r8HggRBZ/k7TRwByq/Hp3P/ubFppIna0nvyavVK0pjA=
 github.com/status-im/rendezvous v1.3.0 h1:7RK/MXXW+tlm0asKm1u7Qp7Yni6AO29a7j8+E4Lbjg4=
 github.com/status-im/rendezvous v1.3.0/go.mod h1:+hzjuP+j/XzLPeF6E50b88pWOTLdTcwjvNYt+Gh1W1s=
-github.com/status-im/status-protocol-go v0.2.3-0.20191010161351-fd48aa752717 h1:ever+LncsKCx0eV/I0zix9Sp3m0dL7HVnl+k016LdWk=
-github.com/status-im/status-protocol-go v0.2.3-0.20191010161351-fd48aa752717/go.mod h1:z4P5yngpR7aB6N6uYtJnhOkHzDHAHlqxTbIbaSX72Jg=
+github.com/status-im/status-protocol-go v0.3.1 h1:UrYdxKeW1GlFDtXWLyR66ebhUxmH1yWy46kal7gaSZ0=
+github.com/status-im/status-protocol-go v0.3.1/go.mod h1:GyEipgAnT0gBMF57gN1yPAicFMM66VZEe2E8M5ktErI=
 github.com/status-im/whisper v1.5.1 h1:87/XIg0Wjua7lXBGiEXgAfTOqlt2Q1dMDuxugTyZbbA=
 github.com/status-im/whisper v1.5.1/go.mod h1:emrOxzJme0k66QtbbQ2bdd3P8RCdLZ8sTD7SkwH1s2s=
 github.com/steakknife/bloomfilter v0.0.0-20180922174646-6819c0d2a570 h1:gIlAHnH1vJb5vwEjIp5kBj/eu99p/bl0Ay2goiPe5xE=

diff --git a/node/node.go b/node/node.go
@@ -32,7 +32,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-protocol-go/transport/whisper/gethbridge"
+	gethbridge "github.com/status-im/status-protocol-go/bridge/geth"
 	whispertypes "github.com/status-im/status-protocol-go/transport/whisper/types"
 	whisper "github.com/status-im/whisper/whisperv6"
 	"github.com/syndtr/goleveldb/leveldb"

diff --git a/services/shhext/api.go b/services/shhext/api.go
@@ -21,9 +21,9 @@ import (
 	whisper "github.com/status-im/whisper/whisperv6"
 
 	statusproto "github.com/status-im/status-protocol-go"
+	gethbridge "github.com/status-im/status-protocol-go/bridge/geth"
 	"github.com/status-im/status-protocol-go/encryption/multidevice"
 	statustransp "github.com/status-im/status-protocol-go/transport/whisper"
-	"github.com/status-im/status-protocol-go/transport/whisper/gethbridge"
 	whispertypes "github.com/status-im/status-protocol-go/transport/whisper/types"
 	statusproto_types "github.com/status-im/status-protocol-go/types"
 )

diff --git a/services/shhext/service_test.go b/services/shhext/service_test.go
@@ -23,7 +23,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-protocol-go/transport/whisper/gethbridge"
+	gethbridge "github.com/status-im/status-protocol-go/bridge/geth"
 	whispertypes "github.com/status-im/status-protocol-go/transport/whisper/types"
 	statusproto "github.com/status-im/status-protocol-go/types"
 	whisper "github.com/status-im/whisper/whisperv6"

diff --git a/t/benchmarks/mailserver_test.go b/t/benchmarks/mailserver_test.go
@@ -10,7 +10,7 @@ import (
 	"github.com/ethereum/go-ethereum/node"
 	"github.com/status-im/status-go/params"
 	"github.com/status-im/status-go/services/shhext"
-	"github.com/status-im/status-protocol-go/transport/whisper/gethbridge"
+	gethbridge "github.com/status-im/status-protocol-go/bridge/geth"
 	whispertypes "github.com/status-im/status-protocol-go/transport/whisper/types"
 	whisper "github.com/status-im/whisper/whisperv6"
 	"github.com/stretchr/testify/require"

diff --git a/vendor/github.com/btcsuite/btcd/btcec/btcec.go b/vendor/github.com/btcsuite/btcd/btcec/btcec.go
diff --git a/vendor/github.com/btcsuite/btcd/btcec/field.go b/vendor/github.com/btcsuite/btcd/btcec/field.go
diff --git a/vendor/github.com/btcsuite/btcd/btcec/pubkey.go b/vendor/github.com/btcsuite/btcd/btcec/pubkey.go
diff --git a/vendor/github.com/btcsuite/btcd/btcec/signature.go b/vendor/github.com/btcsuite/btcd/btcec/signature.go
diff --git a/.../transport/whisper/gethbridge/envelope.go → ...tatus-protocol-go/bridge/geth/envelope.go b/.../transport/whisper/gethbridge/envelope.go → ...tatus-protocol-go/bridge/geth/envelope.go
diff --git a/...port/whisper/gethbridge/envelope_error.go → ...protocol-go/bridge/geth/envelope_error.go b/...port/whisper/gethbridge/envelope_error.go → ...protocol-go/bridge/geth/envelope_error.go
diff --git a/...port/whisper/gethbridge/envelope_event.go → ...protocol-go/bridge/geth/envelope_event.go b/...port/whisper/gethbridge/envelope_event.go → ...protocol-go/bridge/geth/envelope_event.go
diff --git a/...go/transport/whisper/gethbridge/filter.go → .../status-protocol-go/bridge/geth/filter.go b/...go/transport/whisper/gethbridge/filter.go → .../status-protocol-go/bridge/geth/filter.go
diff --git a/...whisper/gethbridge/mailserver_response.go → ...col-go/bridge/geth/mailserver_response.go b/...whisper/gethbridge/mailserver_response.go → ...col-go/bridge/geth/mailserver_response.go
diff --git a/...sport/whisper/gethbridge/message_store.go → ...-protocol-go/bridge/geth/message_store.go b/...sport/whisper/gethbridge/message_store.go → ...-protocol-go/bridge/geth/message_store.go
diff --git a/.../whisper/gethbridge/public_whisper_api.go → ...ocol-go/bridge/geth/public_whisper_api.go b/.../whisper/gethbridge/public_whisper_api.go → ...ocol-go/bridge/geth/public_whisper_api.go
diff --git a/...rt/whisper/gethbridge/received_message.go → ...otocol-go/bridge/geth/received_message.go b/...rt/whisper/gethbridge/received_message.go → ...otocol-go/bridge/geth/received_message.go
diff --git a/...nsport/whisper/gethbridge/subscription.go → ...s-protocol-go/bridge/geth/subscription.go b/...nsport/whisper/gethbridge/subscription.go → ...s-protocol-go/bridge/geth/subscription.go
diff --git a/.../whisper/gethbridge/syncevent_response.go → ...ocol-go/bridge/geth/syncevent_response.go b/.../whisper/gethbridge/syncevent_response.go → ...ocol-go/bridge/geth/syncevent_response.go
diff --git a/...ort/whisper/gethbridge/syncmailrequest.go → ...rotocol-go/bridge/geth/syncmailrequest.go b/...ort/whisper/gethbridge/syncmailrequest.go → ...rotocol-go/bridge/geth/syncmailrequest.go
diff --git a/...o/transport/whisper/gethbridge/whisper.go → ...status-protocol-go/bridge/geth/whisper.go b/...o/transport/whisper/gethbridge/whisper.go → ...status-protocol-go/bridge/geth/whisper.go
diff --git a/vendor/github.com/status-im/status-protocol-go/go.mod b/vendor/github.com/status-im/status-protocol-go/go.mod