TrueCloudLab/neo-go
8
0
Fork 0
mirror of https://github.com/nspcc-dev/neo-go.git synced 2024-11-26 19:42:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1309 from nspcc-dev/fix-yaml-import-path

Browse source 
*: use proper YAML library import path, fix #1306
This commit is contained in:
Roman Khimov 2020-08-12 17:15:37 +03:00 committed by GitHub
commit 7bf0ae11db
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cli/smartcontract/smart_contract.go
View file

@ -11,7 +11,6 @@ import (
"strings" "strings"
"syscall" "syscall"
"github.com/go-yaml/yaml"
"github.com/nspcc-dev/neo-go/cli/flags" "github.com/nspcc-dev/neo-go/cli/flags"
"github.com/nspcc-dev/neo-go/cli/options" "github.com/nspcc-dev/neo-go/cli/options"
"github.com/nspcc-dev/neo-go/pkg/compiler" "github.com/nspcc-dev/neo-go/pkg/compiler"
@ -27,6 +26,7 @@ import (
"github.com/nspcc-dev/neo-go/pkg/wallet" "github.com/nspcc-dev/neo-go/pkg/wallet"
"github.com/urfave/cli" "github.com/urfave/cli"
"golang.org/x/crypto/ssh/terminal" "golang.org/x/crypto/ssh/terminal"
"gopkg.in/yaml.v2"
) )
var ( var (

2
go.mod
View file

@ -7,7 +7,6 @@ require (
github.com/dgraph-io/badger/v2 v2.0.3 github.com/dgraph-io/badger/v2 v2.0.3
github.com/frankban/quicktest v1.10.0 // indirect github.com/frankban/quicktest v1.10.0 // indirect
github.com/go-redis/redis v6.10.2+incompatible 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/gorilla/websocket v1.4.2
github.com/mr-tron/base58 v1.1.2 github.com/mr-tron/base58 v1.1.2
github.com/nspcc-dev/dbft v0.0.0-20200711144034-c526ccc6f570 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/text v0.3.0
golang.org/x/tools v0.0.0-20180318012157-96caea41033d golang.org/x/tools v0.0.0-20180318012157-96caea41033d
gopkg.in/abiosoft/ishell.v2 v2.0.0 gopkg.in/abiosoft/ishell.v2 v2.0.0
gopkg.in/yaml.v2 v2.2.4
) )
go 1.13 go 1.13

2
pkg/config/config.go
View file

@ -5,8 +5,8 @@ import (
"io/ioutil" "io/ioutil"
"os" "os"
"github.com/go-yaml/yaml"
"github.com/nspcc-dev/neo-go/pkg/config/netmode" "github.com/nspcc-dev/neo-go/pkg/config/netmode"
"gopkg.in/yaml.v2"
) )
const userAgentFormat = "/NEO-GO:%s/" const userAgentFormat = "/NEO-GO:%s/"

2
pkg/util/fixed8_test.go
View file

@ -6,10 +6,10 @@ import (
"strconv" "strconv"
"testing" "testing"
"github.com/go-yaml/yaml"
"github.com/nspcc-dev/neo-go/pkg/internal/testserdes" "github.com/nspcc-dev/neo-go/pkg/internal/testserdes"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
"gopkg.in/yaml.v2"
) )
func TestFixed8FromInt64(t *testing.T) { func TestFixed8FromInt64(t *testing.T) {