Merge pull request #1310 from nspcc-dev/fix-yaml-import-path-2.x

*: use proper YAML library import path, fix #1306
This commit is contained in:
Roman Khimov 2020-08-12 17:15:44 +03:00 committed by GitHub
commit 5f46aa096f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 4 additions and 4 deletions

View file

@ -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 (

2
go.mod
View file

@ -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

View file

@ -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/"

View file

@ -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) {