diff options
author | benma <mbencun@gmail.com> | 2019-01-26 21:30:47 +0800 |
---|---|---|
committer | Felix Lange <fjl@users.noreply.github.com> | 2019-01-26 21:30:47 +0800 |
commit | dddd6ef006a6e475073b32a33cf40c311bfdcb35 (patch) | |
tree | 30c033fc51b8c1a18c47419bf78569d8610ac990 | |
parent | 2209fede4e2cb19bc6336562fc41812ec1d56435 (diff) | |
download | go-tangerine-dddd6ef006a6e475073b32a33cf40c311bfdcb35.tar go-tangerine-dddd6ef006a6e475073b32a33cf40c311bfdcb35.tar.gz go-tangerine-dddd6ef006a6e475073b32a33cf40c311bfdcb35.tar.bz2 go-tangerine-dddd6ef006a6e475073b32a33cf40c311bfdcb35.tar.lz go-tangerine-dddd6ef006a6e475073b32a33cf40c311bfdcb35.tar.xz go-tangerine-dddd6ef006a6e475073b32a33cf40c311bfdcb35.tar.zst go-tangerine-dddd6ef006a6e475073b32a33cf40c311bfdcb35.zip |
accounts/usbwallet/trezor: expose protobuf package (#17980)
When some of the same messages are redefined anywhere in a Go project,
the protobuf package panics (see
https://github.com/golang/protobuf/issues/178).
Since this package is internal, there is no way to work around it, as
one cannot use it directly, but also cannot define the same messages.
There is no downside in making the package accessible.
-rw-r--r-- | accounts/usbwallet/trezor.go | 2 | ||||
-rw-r--r-- | accounts/usbwallet/trezor/messages.pb.go (renamed from accounts/usbwallet/internal/trezor/messages.pb.go) | 0 | ||||
-rw-r--r-- | accounts/usbwallet/trezor/messages.proto (renamed from accounts/usbwallet/internal/trezor/messages.proto) | 0 | ||||
-rw-r--r-- | accounts/usbwallet/trezor/trezor.go (renamed from accounts/usbwallet/internal/trezor/trezor.go) | 0 | ||||
-rw-r--r-- | accounts/usbwallet/trezor/types.pb.go (renamed from accounts/usbwallet/internal/trezor/types.pb.go) | 0 | ||||
-rw-r--r-- | accounts/usbwallet/trezor/types.proto (renamed from accounts/usbwallet/internal/trezor/types.proto) | 0 |
6 files changed, 1 insertions, 1 deletions
diff --git a/accounts/usbwallet/trezor.go b/accounts/usbwallet/trezor.go index 82525a20c..d3e17aba1 100644 --- a/accounts/usbwallet/trezor.go +++ b/accounts/usbwallet/trezor.go @@ -28,7 +28,7 @@ import ( "math/big" "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/accounts/usbwallet/internal/trezor" + "github.com/ethereum/go-ethereum/accounts/usbwallet/trezor" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common/hexutil" "github.com/ethereum/go-ethereum/core/types" diff --git a/accounts/usbwallet/internal/trezor/messages.pb.go b/accounts/usbwallet/trezor/messages.pb.go index 15bb6fb73..15bb6fb73 100644 --- a/accounts/usbwallet/internal/trezor/messages.pb.go +++ b/accounts/usbwallet/trezor/messages.pb.go diff --git a/accounts/usbwallet/internal/trezor/messages.proto b/accounts/usbwallet/trezor/messages.proto index 8cb9c8cc2..8cb9c8cc2 100644 --- a/accounts/usbwallet/internal/trezor/messages.proto +++ b/accounts/usbwallet/trezor/messages.proto diff --git a/accounts/usbwallet/internal/trezor/trezor.go b/accounts/usbwallet/trezor/trezor.go index 80cc75efc..80cc75efc 100644 --- a/accounts/usbwallet/internal/trezor/trezor.go +++ b/accounts/usbwallet/trezor/trezor.go diff --git a/accounts/usbwallet/internal/trezor/types.pb.go b/accounts/usbwallet/trezor/types.pb.go index 25b7672d2..25b7672d2 100644 --- a/accounts/usbwallet/internal/trezor/types.pb.go +++ b/accounts/usbwallet/trezor/types.pb.go diff --git a/accounts/usbwallet/internal/trezor/types.proto b/accounts/usbwallet/trezor/types.proto index acbe79e3f..acbe79e3f 100644 --- a/accounts/usbwallet/internal/trezor/types.proto +++ b/accounts/usbwallet/trezor/types.proto |