From 292c1866652f027126d71432e099198f7478278f Mon Sep 17 00:00:00 2001
From: Roman Khimov <roman@nspcc.ru>
Date: Wed, 12 Aug 2020 16:31:06 +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 90c325c86..b4ae76a68 100644
--- a/cli/smartcontract/smart_contract.go
+++ b/cli/smartcontract/smart_contract.go
@@ -11,7 +11,6 @@ import (
 	"strings"
 	"syscall"
 
-	"github.com/go-yaml/yaml"
 	"github.com/nspcc-dev/neo-go/cli/flags"
 	"github.com/nspcc-dev/neo-go/cli/options"
 	"github.com/nspcc-dev/neo-go/pkg/compiler"
@@ -27,6 +26,7 @@ import (
 	"github.com/nspcc-dev/neo-go/pkg/wallet"
 	"github.com/urfave/cli"
 	"golang.org/x/crypto/ssh/terminal"
+	"gopkg.in/yaml.v2"
 )
 
 var (
diff --git a/go.mod b/go.mod
index b16c559c9..82a2b9b41 100644
--- a/go.mod
+++ b/go.mod
@@ -7,7 +7,6 @@ require (
 	github.com/dgraph-io/badger/v2 v2.0.3
 	github.com/frankban/quicktest v1.10.0 // indirect
 	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-20200711144034-c526ccc6f570
@@ -25,6 +24,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 7315e0e82..dbea5bac7 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/nspcc-dev/neo-go/pkg/config/netmode"
+	"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) {