Skip to content

Commit 4cc3b0f

Browse files
author
raynar.sats
committed
feat: remove deprecated protobuf
1 parent 26a4d4f commit 4cc3b0f

15 files changed

+4386
-2551
lines changed

.golangci.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,10 +54,6 @@ issues:
5454
text: 'SA1019: "golang.org/x/crypto/openpgp" is deprecated: this package is unmaintained except for security fixes.'
5555
- path: core/vm/contracts.go
5656
text: 'SA1019: "golang.org/x/crypto/ripemd160" is deprecated: RIPEMD-160 is a legacy hash and should not be used for new applications.'
57-
- path: accounts/usbwallet/trezor.go
58-
text: 'SA1019: "github.com/golang/protobuf/proto" is deprecated: Use the "google.golang.org/protobuf/proto" package instead.'
59-
- path: accounts/usbwallet/trezor/
60-
text: 'SA1019: "github.com/golang/protobuf/proto" is deprecated: Use the "google.golang.org/protobuf/proto" package instead.'
6157
exclude:
6258
- 'SA1019: event.TypeMux is deprecated: use Feed'
6359
- 'SA1019: strings.Title is deprecated'

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ clean:
5151
devtools:
5252
env GOBIN= go install golang.org/x/tools/cmd/stringer@latest
5353
env GOBIN= go install github.com/fjl/gencodec@latest
54-
env GOBIN= go install github.com/golang/protobuf/protoc-gen-go@latest
54+
env GOBIN= go install google.golang.org/protobuf/cmd/protoc-gen-go@latest
5555
env GOBIN= go install ./cmd/abigen
5656
@type "solc" 2> /dev/null || echo 'Please install solc'
5757
@type "protoc" 2> /dev/null || echo 'Please install protoc'

accounts/usbwallet/trezor.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ import (
3333
"github.com/ethereum/go-ethereum/common/hexutil"
3434
"github.com/ethereum/go-ethereum/core/types"
3535
"github.com/ethereum/go-ethereum/log"
36-
"github.com/golang/protobuf/proto"
36+
"google.golang.org/protobuf/proto"
3737
)
3838

3939
// ErrTrezorPINNeeded is returned if opening the trezor requires a PIN code. In
@@ -133,7 +133,7 @@ func (w *trezorDriver) Open(device io.ReadWriter, passphrase string) error {
133133
// Phase 2 requested with actual PIN entry
134134
if w.pinwait {
135135
w.pinwait = false
136-
res, err := w.trezorExchange(&trezor.PinMatrixAck{Pin: &passphrase}, new(trezor.Success), new(trezor.PassphraseRequest))
136+
res, err := w.trezorExchange(&trezor.PinMatrixAck{Pin: passphrase}, new(trezor.Success), new(trezor.PassphraseRequest))
137137
if err != nil {
138138
w.failure = err
139139
return err

0 commit comments

Comments
 (0)