From 6cfed8c90466c411993820b9fbdc23ab0f9afb2b Mon Sep 17 00:00:00 2001 From: Andrea Franz Date: Thu, 21 Oct 2021 15:19:02 +0200 Subject: [PATCH] fix go-ethereum import --- crypto/crypto.go | 2 +- crypto/crypto_test.go | 2 +- globalplatform/globalplatform.go | 2 +- go.mod | 3 +-- go.sum | 2 -- io/normal_channel.go | 2 +- keycard.go | 2 +- secure_channel.go | 2 +- types/exported_key.go | 2 +- types/signature.go | 2 +- 10 files changed, 9 insertions(+), 12 deletions(-) diff --git a/crypto/crypto.go b/crypto/crypto.go index 471e8c1..5d03567 100644 --- a/crypto/crypto.go +++ b/crypto/crypto.go @@ -10,7 +10,7 @@ import ( "crypto/sha512" "errors" - "github.com/status-im/go-ethereum/crypto" + "github.com/ethereum/go-ethereum/crypto" "golang.org/x/crypto/pbkdf2" "golang.org/x/text/unicode/norm" ) diff --git a/crypto/crypto_test.go b/crypto/crypto_test.go index f199189..6e6c46a 100644 --- a/crypto/crypto_test.go +++ b/crypto/crypto_test.go @@ -3,7 +3,7 @@ package crypto import ( "testing" - "github.com/status-im/go-ethereum/crypto" + "github.com/ethereum/go-ethereum/crypto" "github.com/status-im/keycard-go/hexutils" "github.com/stretchr/testify/assert" ) diff --git a/globalplatform/globalplatform.go b/globalplatform/globalplatform.go index 6b40071..5b7f722 100644 --- a/globalplatform/globalplatform.go +++ b/globalplatform/globalplatform.go @@ -1,5 +1,5 @@ package globalplatform -import "github.com/status-im/go-ethereum/log" +import "github.com/ethereum/go-ethereum/log" var logger = log.New("package", "keycard-go/globalplatform") diff --git a/go.mod b/go.mod index 42e025c..e8d5abf 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module github.com/status-im/keycard-go go 1.17 require ( - github.com/status-im/go-ethereum v1.9.1 + github.com/ethereum/go-ethereum v1.10.4 github.com/stretchr/testify v1.7.0 golang.org/x/crypto v0.0.0-20210921155107-089bfa567519 golang.org/x/text v0.3.7 @@ -12,7 +12,6 @@ require ( require ( github.com/btcsuite/btcd v0.22.0-beta // indirect github.com/davecgh/go-spew v1.1.1 // indirect - github.com/ethereum/go-ethereum v1.10.4 // indirect github.com/go-stack/stack v1.8.1 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect golang.org/x/sys v0.0.0-20210816183151-1e6c022a8912 // indirect diff --git a/go.sum b/go.sum index 882507b..6da79b0 100644 --- a/go.sum +++ b/go.sum @@ -287,8 +287,6 @@ github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasO github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ= github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= -github.com/status-im/go-ethereum v1.9.1 h1:N3E3g++Isr4OORPVPwWFlaHp+3EOV9X4A88MbcRsk2Y= -github.com/status-im/go-ethereum v1.9.1/go.mod h1:rdSZTVW2L1V6dsRpW77o4gwqWRUYfb/e9nNHcIgVEO4= github.com/status-im/go-ethereum v1.10.4-status.2 h1:uvcD2U7skYqPQviARFb4w3wZyFSYLs/pfVrJaRSDcCA= github.com/status-im/go-ethereum v1.10.4-status.2/go.mod h1:GvIhpdCOgMHI6i5xVPEZOrv/qSMeOFHbZh77AoyZUoE= github.com/status-im/keycard-go v0.0.0-20190316090335-8537d3370df4/go.mod h1:RZLeN1LMWmRsyYjvAu+I6Dm9QmlDaIIt+Y+4Kd7Tp+Q= diff --git a/io/normal_channel.go b/io/normal_channel.go index 215209f..ef117c3 100644 --- a/io/normal_channel.go +++ b/io/normal_channel.go @@ -1,7 +1,7 @@ package io import ( - "github.com/status-im/go-ethereum/log" + "github.com/ethereum/go-ethereum/log" "github.com/status-im/keycard-go/apdu" "github.com/status-im/keycard-go/globalplatform" "github.com/status-im/keycard-go/hexutils" diff --git a/keycard.go b/keycard.go index 1a74f8d..b590537 100644 --- a/keycard.go +++ b/keycard.go @@ -1,7 +1,7 @@ package keycard import ( - "github.com/status-im/go-ethereum/log" + "github.com/ethereum/go-ethereum/log" ) var logger = log.New("package", "keycard-go") diff --git a/secure_channel.go b/secure_channel.go index 65d6290..277b3a7 100644 --- a/secure_channel.go +++ b/secure_channel.go @@ -5,7 +5,7 @@ import ( "crypto/ecdsa" "errors" - ethcrypto "github.com/status-im/go-ethereum/crypto" + ethcrypto "github.com/ethereum/go-ethereum/crypto" "github.com/status-im/keycard-go/apdu" "github.com/status-im/keycard-go/crypto" "github.com/status-im/keycard-go/globalplatform" diff --git a/types/exported_key.go b/types/exported_key.go index 20325e1..987aaac 100644 --- a/types/exported_key.go +++ b/types/exported_key.go @@ -3,7 +3,7 @@ package types import ( "fmt" - ethcrypto "github.com/status-im/go-ethereum/crypto" + ethcrypto "github.com/ethereum/go-ethereum/crypto" "github.com/status-im/keycard-go/apdu" ) diff --git a/types/signature.go b/types/signature.go index 90b2e51..d54f218 100644 --- a/types/signature.go +++ b/types/signature.go @@ -3,7 +3,7 @@ package types import ( "bytes" - "github.com/status-im/go-ethereum/crypto" + "github.com/ethereum/go-ethereum/crypto" "github.com/status-im/keycard-go/apdu" )