usbwallet: expose internal trezor proto package

When some of the same messages are redefined anywhere in a Go project, the protobuf package panics (see golang/protobuf#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.
benma · Jan 24, 2019 · bc9c993 · bc9c993
1 parent 0a45455
commit bc9c993
Show file tree

Hide file tree

Showing 6 changed files with 1 addition and 1 deletion.
diff --git 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/.../usbwallet/internal/trezor/messages.pb.go → accounts/usbwallet/trezor/messages.pb.go b/.../usbwallet/internal/trezor/messages.pb.go → accounts/usbwallet/trezor/messages.pb.go
diff --git a/.../usbwallet/internal/trezor/messages.proto → accounts/usbwallet/trezor/messages.proto b/.../usbwallet/internal/trezor/messages.proto → accounts/usbwallet/trezor/messages.proto
diff --git a/accounts/usbwallet/internal/trezor/trezor.go → accounts/usbwallet/trezor/trezor.go b/accounts/usbwallet/internal/trezor/trezor.go → accounts/usbwallet/trezor/trezor.go
diff --git a/...nts/usbwallet/internal/trezor/types.pb.go → accounts/usbwallet/trezor/types.pb.go b/...nts/usbwallet/internal/trezor/types.pb.go → accounts/usbwallet/trezor/types.pb.go
diff --git a/...nts/usbwallet/internal/trezor/types.proto → accounts/usbwallet/trezor/types.proto b/...nts/usbwallet/internal/trezor/types.proto → accounts/usbwallet/trezor/types.proto