From 56b2a16389586da3cf4102495ac705eb8f86e63b Mon Sep 17 00:00:00 2001 From: Roman Khimov Date: Wed, 12 Aug 2020 16:26:41 +0300 Subject: [PATCH] *: use proper YAML library import path, fix #1306 --- cli/smartcontract/smart_contract.go | 2 +- go.mod | 2 +- pkg/config/config.go | 2 +- pkg/util/fixed8_test.go | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cli/smartcontract/smart_contract.go b/cli/smartcontract/smart_contract.go index 164ee166a..76b8ab372 100644 --- a/cli/smartcontract/smart_contract.go +++ b/cli/smartcontract/smart_contract.go @@ -13,7 +13,6 @@ import ( "strings" "syscall" - "github.com/go-yaml/yaml" "github.com/nspcc-dev/neo-go/cli/flags" "github.com/nspcc-dev/neo-go/pkg/compiler" "github.com/nspcc-dev/neo-go/pkg/crypto/hash" @@ -28,6 +27,7 @@ import ( "github.com/pkg/errors" "github.com/urfave/cli" "golang.org/x/crypto/ssh/terminal" + "gopkg.in/yaml.v2" ) var ( diff --git a/go.mod b/go.mod index 9d606e46f..643ebbc72 100644 --- a/go.mod +++ b/go.mod @@ -6,7 +6,6 @@ require ( github.com/btcsuite/btcd v0.20.1-beta github.com/dgraph-io/badger/v2 v2.0.3 github.com/go-redis/redis v6.10.2+incompatible - github.com/go-yaml/yaml v2.1.0+incompatible github.com/gorilla/websocket v1.4.2 github.com/mr-tron/base58 v1.1.2 github.com/nspcc-dev/dbft v0.0.0-20200810081309-f40804dbf8a0 @@ -24,6 +23,7 @@ require ( golang.org/x/text v0.3.0 golang.org/x/tools v0.0.0-20180318012157-96caea41033d gopkg.in/abiosoft/ishell.v2 v2.0.0 + gopkg.in/yaml.v2 v2.2.4 ) go 1.13 diff --git a/pkg/config/config.go b/pkg/config/config.go index 999656ffb..2a5c7cdb1 100644 --- a/pkg/config/config.go +++ b/pkg/config/config.go @@ -5,8 +5,8 @@ import ( "io/ioutil" "os" - "github.com/go-yaml/yaml" "github.com/pkg/errors" + "gopkg.in/yaml.v2" ) const userAgentFormat = "/NEO-GO:%s/" diff --git a/pkg/util/fixed8_test.go b/pkg/util/fixed8_test.go index 639ff837a..cd097c9b5 100644 --- a/pkg/util/fixed8_test.go +++ b/pkg/util/fixed8_test.go @@ -6,10 +6,10 @@ import ( "strconv" "testing" - "github.com/go-yaml/yaml" "github.com/nspcc-dev/neo-go/pkg/internal/testserdes" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "gopkg.in/yaml.v2" ) func TestFixed8FromInt64(t *testing.T) {