diff --git a/.circleci/config.yml b/.circleci/config.yml index a69675b62..08af0c75e 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -28,7 +28,7 @@ commands: jobs: lint: - working_directory: /go/src/github.com/CityOfZion/neo-go + working_directory: /go/src/github.com/nspcc-dev/neo-go executor: go1_13 steps: - checkout @@ -40,7 +40,7 @@ jobs: golint -set_exit_status ./... vet: - working_directory: /go/src/github.com/CityOfZion/neo-go + working_directory: /go/src/github.com/nspcc-dev/neo-go executor: go1_13 steps: - checkout @@ -50,7 +50,7 @@ jobs: command: go vet ./... test_1_12: - working_directory: /go/src/github.com/CityOfZion/neo-go + working_directory: /go/src/github.com/nspcc-dev/neo-go executor: go1_12 steps: - checkout @@ -60,7 +60,7 @@ jobs: - run: go test -v -race ./... test_1_13: - working_directory: /go/src/github.com/CityOfZion/neo-go + working_directory: /go/src/github.com/nspcc-dev/neo-go executor: go1_13 steps: - checkout @@ -72,7 +72,7 @@ jobs: file: coverage.txt build_cli: - working_directory: /go/src/github.com/CityOfZion/neo-go + working_directory: /go/src/github.com/nspcc-dev/neo-go executor: go1_12 steps: - checkout @@ -83,7 +83,7 @@ jobs: destination: / build_image: - working_directory: /go/src/github.com/CityOfZion/neo-go + working_directory: /go/src/github.com/nspcc-dev/neo-go executor: go1_12 docker: - image: golang:1-alpine diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 85946ec5c..db72a29dd 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -3,8 +3,8 @@ First, thank you for contributing! We love and encourage pull requests from everyone. Please follow the guidelines: -1. Check the open [issues](https://github.com/CityOfZion/neo-go/issues) and -[pull requests](https://github.com/CityOfZion/neo-go/pulls) for existing discussions. +1. Check the open [issues](https://github.com/nspcc-dev/neo-go/issues) and +[pull requests](https://github.com/nspcc-dev/neo-go/pulls) for existing discussions. 1. Open an issue first, to discuss a new feature or enhancement. 1. Write tests, and make sure the test suite passes locally and on CI. 1. Open a pull request, and reference the relevant issue(s). diff --git a/cli/main.go b/cli/main.go index 6e2817ac9..45dbe7bff 100644 --- a/cli/main.go +++ b/cli/main.go @@ -3,11 +3,11 @@ package main import ( "os" - "github.com/CityOfZion/neo-go/cli/server" - "github.com/CityOfZion/neo-go/cli/smartcontract" - "github.com/CityOfZion/neo-go/cli/vm" - "github.com/CityOfZion/neo-go/cli/wallet" - "github.com/CityOfZion/neo-go/config" + "github.com/nspcc-dev/neo-go/cli/server" + "github.com/nspcc-dev/neo-go/cli/smartcontract" + "github.com/nspcc-dev/neo-go/cli/vm" + "github.com/nspcc-dev/neo-go/cli/wallet" + "github.com/nspcc-dev/neo-go/config" "github.com/urfave/cli" ) diff --git a/cli/server/dump.go b/cli/server/dump.go index 37865d3ab..0e38fa74e 100644 --- a/cli/server/dump.go +++ b/cli/server/dump.go @@ -7,8 +7,8 @@ import ( "os" "path/filepath" - "github.com/CityOfZion/neo-go/pkg/core/storage" - "github.com/CityOfZion/neo-go/pkg/util" + "github.com/nspcc-dev/neo-go/pkg/core/storage" + "github.com/nspcc-dev/neo-go/pkg/util" ) type dump []interface{} diff --git a/cli/server/server.go b/cli/server/server.go index f2bc41edd..259a57692 100644 --- a/cli/server/server.go +++ b/cli/server/server.go @@ -6,15 +6,15 @@ import ( "os" "os/signal" - "github.com/CityOfZion/neo-go/config" - "github.com/CityOfZion/neo-go/pkg/core" - "github.com/CityOfZion/neo-go/pkg/core/block" - "github.com/CityOfZion/neo-go/pkg/core/storage" - "github.com/CityOfZion/neo-go/pkg/encoding/address" - "github.com/CityOfZion/neo-go/pkg/io" - "github.com/CityOfZion/neo-go/pkg/network" - "github.com/CityOfZion/neo-go/pkg/network/metrics" - "github.com/CityOfZion/neo-go/pkg/rpc/server" + "github.com/nspcc-dev/neo-go/config" + "github.com/nspcc-dev/neo-go/pkg/core" + "github.com/nspcc-dev/neo-go/pkg/core/block" + "github.com/nspcc-dev/neo-go/pkg/core/storage" + "github.com/nspcc-dev/neo-go/pkg/encoding/address" + "github.com/nspcc-dev/neo-go/pkg/io" + "github.com/nspcc-dev/neo-go/pkg/network" + "github.com/nspcc-dev/neo-go/pkg/network/metrics" + "github.com/nspcc-dev/neo-go/pkg/rpc/server" "github.com/pkg/errors" "github.com/urfave/cli" "go.uber.org/zap" diff --git a/cli/smartcontract/smart_contract.go b/cli/smartcontract/smart_contract.go index aec4f901f..33278122f 100644 --- a/cli/smartcontract/smart_contract.go +++ b/cli/smartcontract/smart_contract.go @@ -11,16 +11,16 @@ import ( "os" "path/filepath" - "github.com/CityOfZion/neo-go/pkg/compiler" - "github.com/CityOfZion/neo-go/pkg/crypto/hash" - "github.com/CityOfZion/neo-go/pkg/crypto/keys" - "github.com/CityOfZion/neo-go/pkg/rpc/client" - "github.com/CityOfZion/neo-go/pkg/rpc/request" - "github.com/CityOfZion/neo-go/pkg/rpc/response/result" - "github.com/CityOfZion/neo-go/pkg/smartcontract" - "github.com/CityOfZion/neo-go/pkg/util" - "github.com/CityOfZion/neo-go/pkg/vm" "github.com/go-yaml/yaml" + "github.com/nspcc-dev/neo-go/pkg/compiler" + "github.com/nspcc-dev/neo-go/pkg/crypto/hash" + "github.com/nspcc-dev/neo-go/pkg/crypto/keys" + "github.com/nspcc-dev/neo-go/pkg/rpc/client" + "github.com/nspcc-dev/neo-go/pkg/rpc/request" + "github.com/nspcc-dev/neo-go/pkg/rpc/response/result" + "github.com/nspcc-dev/neo-go/pkg/smartcontract" + "github.com/nspcc-dev/neo-go/pkg/util" + "github.com/nspcc-dev/neo-go/pkg/vm" "github.com/pkg/errors" "github.com/urfave/cli" ) @@ -53,7 +53,7 @@ const ( // %s is parsed to be the smartContractName smartContractTmpl = `package %s -import "github.com/CityOfZion/neo-go/pkg/interop/runtime" +import "github.com/nspcc-dev/neo-go/pkg/interop/runtime" func Main(op string, args []interface{}) { runtime.Notify("Hello world!") diff --git a/cli/vm/vm.go b/cli/vm/vm.go index 3dab28638..5ea7c68a3 100644 --- a/cli/vm/vm.go +++ b/cli/vm/vm.go @@ -1,7 +1,7 @@ package vm import ( - vmcli "github.com/CityOfZion/neo-go/pkg/vm/cli" + vmcli "github.com/nspcc-dev/neo-go/pkg/vm/cli" "github.com/urfave/cli" ) diff --git a/cli/wallet/wallet.go b/cli/wallet/wallet.go index e677c6959..41c043d90 100644 --- a/cli/wallet/wallet.go +++ b/cli/wallet/wallet.go @@ -9,14 +9,14 @@ import ( "strings" "syscall" - "github.com/CityOfZion/neo-go/pkg/core" - "github.com/CityOfZion/neo-go/pkg/core/transaction" - "github.com/CityOfZion/neo-go/pkg/crypto/keys" - "github.com/CityOfZion/neo-go/pkg/encoding/address" - "github.com/CityOfZion/neo-go/pkg/rpc/client" - "github.com/CityOfZion/neo-go/pkg/rpc/request" - "github.com/CityOfZion/neo-go/pkg/util" - "github.com/CityOfZion/neo-go/pkg/wallet" + "github.com/nspcc-dev/neo-go/pkg/core" + "github.com/nspcc-dev/neo-go/pkg/core/transaction" + "github.com/nspcc-dev/neo-go/pkg/crypto/keys" + "github.com/nspcc-dev/neo-go/pkg/encoding/address" + "github.com/nspcc-dev/neo-go/pkg/rpc/client" + "github.com/nspcc-dev/neo-go/pkg/rpc/request" + "github.com/nspcc-dev/neo-go/pkg/util" + "github.com/nspcc-dev/neo-go/pkg/wallet" "github.com/urfave/cli" "golang.org/x/crypto/ssh/terminal" ) diff --git a/config/config.go b/config/config.go index 8f6658e11..a57464778 100644 --- a/config/config.go +++ b/config/config.go @@ -6,11 +6,11 @@ import ( "os" "time" - "github.com/CityOfZion/neo-go/pkg/core/storage" - "github.com/CityOfZion/neo-go/pkg/core/transaction" - "github.com/CityOfZion/neo-go/pkg/network/metrics" - "github.com/CityOfZion/neo-go/pkg/util" "github.com/go-yaml/yaml" + "github.com/nspcc-dev/neo-go/pkg/core/storage" + "github.com/nspcc-dev/neo-go/pkg/core/transaction" + "github.com/nspcc-dev/neo-go/pkg/network/metrics" + "github.com/nspcc-dev/neo-go/pkg/util" "github.com/pkg/errors" ) diff --git a/docs/compiler.md b/docs/compiler.md index 7d44bfa67..3887028d9 100644 --- a/docs/compiler.md +++ b/docs/compiler.md @@ -146,8 +146,8 @@ Some examples are provided in the [examples directory](https://github.com/nspcc- package mycontract import ( - "github.com/CityOfZion/neo-go/pkg/interop/runtime" - "github.com/CityOfZion/neo-go/pkg/interop/util" + "github.com/nspcc-dev/neo-go/pkg/interop/runtime" + "github.com/nspcc-dev/neo-go/pkg/interop/util" ) var owner = util.FromAddress("AJX1jGfj3qPBbpAKjY527nPbnrnvSx9nCg") @@ -170,8 +170,8 @@ func Main() bool { package mytoken import ( - "github.com/CityOfZion/neo-go/pkg/interop/runtime" - "github.com/CityOfZion/neo-go/pkg/interop/storage" + "github.com/nspcc-dev/neo-go/pkg/interop/runtime" + "github.com/nspcc-dev/neo-go/pkg/interop/storage" ) var owner = util.FromAddress("AJX1jGfj3qPBbpAKjY527nPbnrnvSx9nCg") diff --git a/docs/vm.md b/docs/vm.md index 5871a6247..c9454c3b5 100644 --- a/docs/vm.md +++ b/docs/vm.md @@ -117,7 +117,7 @@ You can invoke smart contracts with arguments. Take the following ***roll the di ``` package rollthedice -import "github.com/CityOfZion/neo-go/pkg/interop/runtime" +import "github.com/nspcc-dev/neo-go/pkg/interop/runtime" func Main(method string, args []interface{}) int { if method == "rollDice" { diff --git a/examples/engine/engine.go b/examples/engine/engine.go index b2d3fdfe5..d5a914c68 100644 --- a/examples/engine/engine.go +++ b/examples/engine/engine.go @@ -1,8 +1,8 @@ package enginecontract import ( - "github.com/CityOfZion/neo-go/pkg/interop/engine" - "github.com/CityOfZion/neo-go/pkg/interop/runtime" + "github.com/nspcc-dev/neo-go/pkg/interop/engine" + "github.com/nspcc-dev/neo-go/pkg/interop/runtime" ) // Main is that famous Main() function, you know. diff --git a/examples/iterator/iterator.go b/examples/iterator/iterator.go index 593ab168e..96ccf73f1 100644 --- a/examples/iterator/iterator.go +++ b/examples/iterator/iterator.go @@ -1,9 +1,9 @@ package iteratorcontract import ( - "github.com/CityOfZion/neo-go/pkg/interop/iterator" - "github.com/CityOfZion/neo-go/pkg/interop/runtime" - "github.com/CityOfZion/neo-go/pkg/interop/storage" + "github.com/nspcc-dev/neo-go/pkg/interop/iterator" + "github.com/nspcc-dev/neo-go/pkg/interop/runtime" + "github.com/nspcc-dev/neo-go/pkg/interop/storage" ) // Main is Main(), really. diff --git a/examples/runtime/runtime.go b/examples/runtime/runtime.go index 8b935854a..9bee81a66 100644 --- a/examples/runtime/runtime.go +++ b/examples/runtime/runtime.go @@ -1,8 +1,8 @@ package runtimecontract import ( - "github.com/CityOfZion/neo-go/pkg/interop/runtime" - "github.com/CityOfZion/neo-go/pkg/interop/util" + "github.com/nspcc-dev/neo-go/pkg/interop/runtime" + "github.com/nspcc-dev/neo-go/pkg/interop/util" ) // Check if the invoker of the contract is the specified owner diff --git a/examples/storage/storage.go b/examples/storage/storage.go index c12f5a5c9..72450fd36 100644 --- a/examples/storage/storage.go +++ b/examples/storage/storage.go @@ -1,7 +1,7 @@ package storagecontract import ( - "github.com/CityOfZion/neo-go/pkg/interop/storage" + "github.com/nspcc-dev/neo-go/pkg/interop/storage" ) // Main is a very useful function. diff --git a/examples/token-sale/token_sale.go b/examples/token-sale/token_sale.go index 2dd8edb0f..a6276f121 100644 --- a/examples/token-sale/token_sale.go +++ b/examples/token-sale/token_sale.go @@ -1,9 +1,9 @@ package tokensale import ( - "github.com/CityOfZion/neo-go/pkg/interop/runtime" - "github.com/CityOfZion/neo-go/pkg/interop/storage" - "github.com/CityOfZion/neo-go/pkg/interop/util" + "github.com/nspcc-dev/neo-go/pkg/interop/runtime" + "github.com/nspcc-dev/neo-go/pkg/interop/storage" + "github.com/nspcc-dev/neo-go/pkg/interop/util" ) const ( diff --git a/examples/token/nep5/nep5.go b/examples/token/nep5/nep5.go index e4bc2267e..f16abd38c 100644 --- a/examples/token/nep5/nep5.go +++ b/examples/token/nep5/nep5.go @@ -1,10 +1,10 @@ package nep5 import ( - "github.com/CityOfZion/neo-go/pkg/interop/engine" - "github.com/CityOfZion/neo-go/pkg/interop/runtime" - "github.com/CityOfZion/neo-go/pkg/interop/storage" - "github.com/CityOfZion/neo-go/pkg/interop/util" + "github.com/nspcc-dev/neo-go/pkg/interop/engine" + "github.com/nspcc-dev/neo-go/pkg/interop/runtime" + "github.com/nspcc-dev/neo-go/pkg/interop/storage" + "github.com/nspcc-dev/neo-go/pkg/interop/util" ) // Token holds all token info diff --git a/examples/token/token.go b/examples/token/token.go index b8111c55d..51f045f81 100644 --- a/examples/token/token.go +++ b/examples/token/token.go @@ -1,10 +1,10 @@ package tokencontract import ( - "github.com/CityOfZion/neo-go/examples/token/nep5" + "github.com/nspcc-dev/neo-go/examples/token/nep5" - "github.com/CityOfZion/neo-go/pkg/interop/storage" - "github.com/CityOfZion/neo-go/pkg/interop/util" + "github.com/nspcc-dev/neo-go/pkg/interop/storage" + "github.com/nspcc-dev/neo-go/pkg/interop/util" ) const ( diff --git a/go.mod b/go.mod index 95e9ff398..309c5d88a 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/CityOfZion/neo-go +module github.com/nspcc-dev/neo-go require ( github.com/Workiva/go-datastructures v1.0.50 @@ -7,7 +7,7 @@ require ( github.com/go-redis/redis v6.10.2+incompatible github.com/go-yaml/yaml v2.1.0+incompatible github.com/mr-tron/base58 v1.1.2 - github.com/nspcc-dev/dbft v0.0.0-20200219114139-199d286ed6c1 + github.com/nspcc-dev/dbft v0.0.0-20200303142906-383e2589bc69 github.com/nspcc-dev/rfc6979 v0.2.0 github.com/pkg/errors v0.8.1 github.com/prometheus/client_golang v1.2.1 diff --git a/go.sum b/go.sum index 6ede96e81..58dd8e68d 100644 --- a/go.sum +++ b/go.sum @@ -1,7 +1,7 @@ -github.com/CityOfZion/neo-go v0.62.1-pre.0.20191114145240-e740fbe708f8/go.mod h1:MJCkWUBhi9pn/CrYO1Q3P687y2KeahrOPS9BD9LDGb0= -github.com/CityOfZion/neo-go v0.70.1-pre.0.20191209120015-fccb0085941e/go.mod h1:0enZl0az8xA6PVkwzEOwPWVJGqlt/GO4hA4kmQ5Xzig= -github.com/CityOfZion/neo-go v0.70.1-pre.0.20191212173117-32ac01130d4c/go.mod h1:JtlHfeqLywZLswKIKFnAp+yzezY4Dji9qlfQKB2OD/I= -github.com/CityOfZion/neo-go v0.71.1-pre.0.20200129171427-f773ec69fb84/go.mod h1:FLI526IrRWHmcsO+mHsCbj64pJZhwQFTLJZu+A4PGOA= +github.com/nspcc-dev/neo-go v0.62.1-pre.0.20191114145240-e740fbe708f8/go.mod h1:MJCkWUBhi9pn/CrYO1Q3P687y2KeahrOPS9BD9LDGb0= +github.com/nspcc-dev/neo-go v0.70.1-pre.0.20191209120015-fccb0085941e/go.mod h1:0enZl0az8xA6PVkwzEOwPWVJGqlt/GO4hA4kmQ5Xzig= +github.com/nspcc-dev/neo-go v0.70.1-pre.0.20191212173117-32ac01130d4c/go.mod h1:JtlHfeqLywZLswKIKFnAp+yzezY4Dji9qlfQKB2OD/I= +github.com/nspcc-dev/neo-go v0.71.1-pre.0.20200129171427-f773ec69fb84/go.mod h1:FLI526IrRWHmcsO+mHsCbj64pJZhwQFTLJZu+A4PGOA= github.com/Workiva/go-datastructures v1.0.50 h1:slDmfW6KCHcC7U+LP3DDBbm4fqTwZGn1beOFPfGaLvo= github.com/Workiva/go-datastructures v1.0.50/go.mod h1:Z+F2Rca0qCsVYDS8z7bAGm8f3UkzuWYS/oBZz5a7VVA= github.com/abiosoft/ishell v2.0.0+incompatible h1:zpwIuEHc37EzrsIYah3cpevrIc8Oma7oZPxr03tlmmw= @@ -99,6 +99,9 @@ github.com/nspcc-dev/dbft v0.0.0-20200117124306-478e5cfbf03a h1:ajvxgEe9qY4vvoSm github.com/nspcc-dev/dbft v0.0.0-20200117124306-478e5cfbf03a/go.mod h1:/YFK+XOxxg0Bfm6P92lY5eDSLYfp06XOdL8KAVgXjVk= github.com/nspcc-dev/dbft v0.0.0-20200219114139-199d286ed6c1 h1:yEx9WznS+rjE0jl0dLujCxuZSIb+UTjF+005TJu/nNI= github.com/nspcc-dev/dbft v0.0.0-20200219114139-199d286ed6c1/go.mod h1:O0qtn62prQSqizzoagHmuuKoz8QMkU3SzBoKdEvm3aQ= +github.com/nspcc-dev/dbft v0.0.0-20200303142906-383e2589bc69 h1:jp29/ONuo8ECHXNirePBL/fG/fcuFlZxbItMCEZz05A= +github.com/nspcc-dev/dbft v0.0.0-20200303142906-383e2589bc69/go.mod h1:1FYQXSbb6/9HQIkoF8XO7W/S8N7AZRkBsgwbcXRvk0E= +github.com/nspcc-dev/neo-go v0.73.1-pre.0.20200303142215-f5a1b928ce09/go.mod h1:pPYwPZ2ks+uMnlRLUyXOpLieaDQSEaf4NM3zHVbRjmg= github.com/nspcc-dev/neofs-crypto v0.2.0 h1:ftN+59WqxSWz/RCgXYOfhmltOOqU+udsNQSvN6wkFck= github.com/nspcc-dev/neofs-crypto v0.2.0/go.mod h1:F/96fUzPM3wR+UGsPi3faVNmFlA9KAEAUQR7dMxZmNA= github.com/nspcc-dev/neofs-crypto v0.2.3 h1:aca3X2aly92ENRbFK+kH6Hd+J9EQ4Eu6XMVoITSIKtc= diff --git a/integration/README.md b/integration/README.md index 4903a78ff..5937214a1 100644 --- a/integration/README.md +++ b/integration/README.md @@ -13,7 +13,7 @@ Result: ``` 10000 402421 ns/op 177370 B/op 90 allocs/op PASS -ok github.com/CityOfZion/neo-go/integration 4.360s +ok github.com/nspcc-dev/neo-go/integration 4.360s ``` diff --git a/integration/performance_test.go b/integration/performance_test.go index 7945ddfce..e3a4ba329 100644 --- a/integration/performance_test.go +++ b/integration/performance_test.go @@ -4,14 +4,14 @@ import ( "math/rand" "testing" - "github.com/CityOfZion/neo-go/config" - "github.com/CityOfZion/neo-go/pkg/core" - "github.com/CityOfZion/neo-go/pkg/core/storage" - "github.com/CityOfZion/neo-go/pkg/core/transaction" - "github.com/CityOfZion/neo-go/pkg/crypto/keys" - "github.com/CityOfZion/neo-go/pkg/encoding/address" - "github.com/CityOfZion/neo-go/pkg/network" - "github.com/CityOfZion/neo-go/pkg/wallet" + "github.com/nspcc-dev/neo-go/config" + "github.com/nspcc-dev/neo-go/pkg/core" + "github.com/nspcc-dev/neo-go/pkg/core/storage" + "github.com/nspcc-dev/neo-go/pkg/core/transaction" + "github.com/nspcc-dev/neo-go/pkg/crypto/keys" + "github.com/nspcc-dev/neo-go/pkg/encoding/address" + "github.com/nspcc-dev/neo-go/pkg/network" + "github.com/nspcc-dev/neo-go/pkg/wallet" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.uber.org/zap/zaptest" diff --git a/pkg/compiler/codegen.go b/pkg/compiler/codegen.go index 0f0f4563c..9956f9a9f 100644 --- a/pkg/compiler/codegen.go +++ b/pkg/compiler/codegen.go @@ -13,11 +13,11 @@ import ( "strconv" "strings" - "github.com/CityOfZion/neo-go/pkg/encoding/address" - "github.com/CityOfZion/neo-go/pkg/io" - "github.com/CityOfZion/neo-go/pkg/vm" - "github.com/CityOfZion/neo-go/pkg/vm/emit" - "github.com/CityOfZion/neo-go/pkg/vm/opcode" + "github.com/nspcc-dev/neo-go/pkg/encoding/address" + "github.com/nspcc-dev/neo-go/pkg/io" + "github.com/nspcc-dev/neo-go/pkg/vm" + "github.com/nspcc-dev/neo-go/pkg/vm/emit" + "github.com/nspcc-dev/neo-go/pkg/vm/opcode" ) // The identifier of the entry function. Default set to Main. diff --git a/pkg/compiler/codegen_test.go b/pkg/compiler/codegen_test.go index 369b71caa..b499771d8 100644 --- a/pkg/compiler/codegen_test.go +++ b/pkg/compiler/codegen_test.go @@ -4,8 +4,8 @@ import ( "go/token" "testing" - "github.com/CityOfZion/neo-go/pkg/io" - "github.com/CityOfZion/neo-go/pkg/vm/opcode" + "github.com/nspcc-dev/neo-go/pkg/io" + "github.com/nspcc-dev/neo-go/pkg/vm/opcode" "github.com/stretchr/testify/assert" ) diff --git a/pkg/compiler/compiler_test.go b/pkg/compiler/compiler_test.go index 94d270228..2d004da20 100644 --- a/pkg/compiler/compiler_test.go +++ b/pkg/compiler/compiler_test.go @@ -6,7 +6,7 @@ import ( "path" "testing" - "github.com/CityOfZion/neo-go/pkg/compiler" + "github.com/nspcc-dev/neo-go/pkg/compiler" "github.com/stretchr/testify/require" ) diff --git a/pkg/compiler/for_test.go b/pkg/compiler/for_test.go index 56f34da3c..d45618168 100644 --- a/pkg/compiler/for_test.go +++ b/pkg/compiler/for_test.go @@ -6,9 +6,9 @@ import ( "strings" "testing" - "github.com/CityOfZion/neo-go/pkg/compiler" + "github.com/nspcc-dev/neo-go/pkg/compiler" - "github.com/CityOfZion/neo-go/pkg/vm" + "github.com/nspcc-dev/neo-go/pkg/vm" "github.com/stretchr/testify/require" ) diff --git a/pkg/compiler/import_test.go b/pkg/compiler/import_test.go index 4ce80e5b0..7c635be3e 100644 --- a/pkg/compiler/import_test.go +++ b/pkg/compiler/import_test.go @@ -9,7 +9,7 @@ func TestImportFunction(t *testing.T) { src := ` package somethingelse - import "github.com/CityOfZion/neo-go/pkg/compiler/testdata/foo" + import "github.com/nspcc-dev/neo-go/pkg/compiler/testdata/foo" func Main() int { i := foo.NewBar() @@ -23,7 +23,7 @@ func TestImportStruct(t *testing.T) { src := ` package somethingwedontcareabout - import "github.com/CityOfZion/neo-go/pkg/compiler/testdata/bar" + import "github.com/nspcc-dev/neo-go/pkg/compiler/testdata/bar" func Main() int { b := bar.Bar{ @@ -39,7 +39,7 @@ func TestMultipleDirFileImport(t *testing.T) { src := ` package hello - import "github.com/CityOfZion/neo-go/pkg/compiler/testdata/foobar" + import "github.com/nspcc-dev/neo-go/pkg/compiler/testdata/foobar" func Main() bool { ok := foobar.OtherBool() diff --git a/pkg/compiler/interop_test.go b/pkg/compiler/interop_test.go index 2ebc71c29..4c2ef69ac 100644 --- a/pkg/compiler/interop_test.go +++ b/pkg/compiler/interop_test.go @@ -5,10 +5,10 @@ import ( "strings" "testing" - "github.com/CityOfZion/neo-go/pkg/compiler" - "github.com/CityOfZion/neo-go/pkg/crypto/hash" - "github.com/CityOfZion/neo-go/pkg/encoding/address" - "github.com/CityOfZion/neo-go/pkg/util" + "github.com/nspcc-dev/neo-go/pkg/compiler" + "github.com/nspcc-dev/neo-go/pkg/crypto/hash" + "github.com/nspcc-dev/neo-go/pkg/encoding/address" + "github.com/nspcc-dev/neo-go/pkg/util" "github.com/stretchr/testify/require" ) @@ -24,7 +24,7 @@ func TestFromAddress(t *testing.T) { t.Run("append 2 addresses", func(t *testing.T) { src := ` package foo - import "github.com/CityOfZion/neo-go/pkg/interop/util" + import "github.com/nspcc-dev/neo-go/pkg/interop/util" func Main() []byte { addr1 := util.FromAddress("` + as1 + `") addr2 := util.FromAddress("` + as2 + `") @@ -39,7 +39,7 @@ func TestFromAddress(t *testing.T) { t.Run("append 2 addresses inline", func(t *testing.T) { src := ` package foo - import "github.com/CityOfZion/neo-go/pkg/interop/util" + import "github.com/nspcc-dev/neo-go/pkg/interop/util" func Main() []byte { addr1 := util.FromAddress("` + as1 + `") sum := append(addr1, util.FromAddress("` + as2 + `")...) @@ -101,7 +101,7 @@ func TestAppCall(t *testing.T) { t.Run("convert from string constant", func(t *testing.T) { src := ` package foo - import "github.com/CityOfZion/neo-go/pkg/interop/engine" + import "github.com/nspcc-dev/neo-go/pkg/interop/engine" const scriptHash = ` + fmt.Sprintf("%#v", string(ih.BytesBE())) + ` func Main() []byte { x := []byte{1, 2} @@ -123,7 +123,7 @@ func TestAppCall(t *testing.T) { func getAppCallScript(h string) string { return ` package foo - import "github.com/CityOfZion/neo-go/pkg/interop/engine" + import "github.com/nspcc-dev/neo-go/pkg/interop/engine" func Main() []byte { x := []byte{1, 2} y := []byte{3, 4} diff --git a/pkg/compiler/panic_test.go b/pkg/compiler/panic_test.go index f6e3b4d59..cdc857a82 100644 --- a/pkg/compiler/panic_test.go +++ b/pkg/compiler/panic_test.go @@ -5,7 +5,7 @@ import ( "math/big" "testing" - "github.com/CityOfZion/neo-go/pkg/vm" + "github.com/nspcc-dev/neo-go/pkg/vm" "github.com/stretchr/testify/require" ) diff --git a/pkg/compiler/struct_test.go b/pkg/compiler/struct_test.go index 99521b57e..964edbbd4 100644 --- a/pkg/compiler/struct_test.go +++ b/pkg/compiler/struct_test.go @@ -4,7 +4,7 @@ import ( "math/big" "testing" - "github.com/CityOfZion/neo-go/pkg/vm" + "github.com/nspcc-dev/neo-go/pkg/vm" ) var structTestCases = []testCase{ diff --git a/pkg/compiler/syscall_test.go b/pkg/compiler/syscall_test.go index 4e62721b3..e60544fb5 100644 --- a/pkg/compiler/syscall_test.go +++ b/pkg/compiler/syscall_test.go @@ -8,7 +8,7 @@ func TestStoragePutGet(t *testing.T) { src := ` package foo - import "github.com/CityOfZion/neo-go/pkg/interop/storage" + import "github.com/nspcc-dev/neo-go/pkg/interop/storage" func Main() string { ctx := storage.GetContext() diff --git a/pkg/compiler/testdata/compile/test.go b/pkg/compiler/testdata/compile/test.go index 4290d67c4..5bc47d05a 100644 --- a/pkg/compiler/testdata/compile/test.go +++ b/pkg/compiler/testdata/compile/test.go @@ -1,6 +1,6 @@ package compile -import "github.com/CityOfZion/neo-go/pkg/interop/runtime" +import "github.com/nspcc-dev/neo-go/pkg/interop/runtime" func Main() { runtime.Notify("Hello world!") diff --git a/pkg/compiler/util_test.go b/pkg/compiler/util_test.go index 23ddd427f..90fc19c35 100644 --- a/pkg/compiler/util_test.go +++ b/pkg/compiler/util_test.go @@ -8,7 +8,7 @@ func TestSHA256(t *testing.T) { src := ` package foo import ( - "github.com/CityOfZion/neo-go/pkg/interop/crypto" + "github.com/nspcc-dev/neo-go/pkg/interop/crypto" ) func Main() []byte { src := []byte{0x97} @@ -23,7 +23,7 @@ func TestSHA1(t *testing.T) { src := ` package foo import ( - "github.com/CityOfZion/neo-go/pkg/interop/crypto" + "github.com/nspcc-dev/neo-go/pkg/interop/crypto" ) func Main() []byte { src := []byte{0x97} @@ -38,7 +38,7 @@ func TestHash160(t *testing.T) { src := ` package foo import ( - "github.com/CityOfZion/neo-go/pkg/interop/crypto" + "github.com/nspcc-dev/neo-go/pkg/interop/crypto" ) func Main() []byte { src := []byte{0x97} @@ -53,7 +53,7 @@ func TestHash256(t *testing.T) { src := ` package foo import ( - "github.com/CityOfZion/neo-go/pkg/interop/crypto" + "github.com/nspcc-dev/neo-go/pkg/interop/crypto" ) func Main() []byte { src := []byte{0x97} diff --git a/pkg/compiler/verify_test.go b/pkg/compiler/verify_test.go index 276e2fab2..754a6d7a8 100644 --- a/pkg/compiler/verify_test.go +++ b/pkg/compiler/verify_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/CityOfZion/neo-go/pkg/crypto/keys" + "github.com/nspcc-dev/neo-go/pkg/crypto/keys" "github.com/stretchr/testify/require" ) @@ -43,7 +43,7 @@ func getVerifyProg(pub, sig, msg []byte) string { return ` package hello - import "github.com/CityOfZion/neo-go/pkg/interop/crypto" + import "github.com/nspcc-dev/neo-go/pkg/interop/crypto" func Main() bool { pub := ` + pubS + ` diff --git a/pkg/compiler/vm_test.go b/pkg/compiler/vm_test.go index 3e4780279..41ed566a4 100644 --- a/pkg/compiler/vm_test.go +++ b/pkg/compiler/vm_test.go @@ -5,8 +5,8 @@ import ( "strings" "testing" - "github.com/CityOfZion/neo-go/pkg/compiler" - "github.com/CityOfZion/neo-go/pkg/vm" + "github.com/nspcc-dev/neo-go/pkg/compiler" + "github.com/nspcc-dev/neo-go/pkg/vm" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/pkg/consensus/block.go b/pkg/consensus/block.go index 90824fe9e..ab4449b53 100644 --- a/pkg/consensus/block.go +++ b/pkg/consensus/block.go @@ -1,11 +1,11 @@ package consensus import ( - coreb "github.com/CityOfZion/neo-go/pkg/core/block" - "github.com/CityOfZion/neo-go/pkg/core/transaction" - "github.com/CityOfZion/neo-go/pkg/util" "github.com/nspcc-dev/dbft/block" "github.com/nspcc-dev/dbft/crypto" + coreb "github.com/nspcc-dev/neo-go/pkg/core/block" + "github.com/nspcc-dev/neo-go/pkg/core/transaction" + "github.com/nspcc-dev/neo-go/pkg/util" ) // neoBlock is a wrapper of core.Block which implements diff --git a/pkg/consensus/block_test.go b/pkg/consensus/block_test.go index fda210402..2da15057e 100644 --- a/pkg/consensus/block_test.go +++ b/pkg/consensus/block_test.go @@ -4,9 +4,9 @@ import ( "crypto/rand" "testing" - "github.com/CityOfZion/neo-go/pkg/util" "github.com/nspcc-dev/dbft/block" "github.com/nspcc-dev/dbft/crypto" + "github.com/nspcc-dev/neo-go/pkg/util" "github.com/stretchr/testify/require" ) diff --git a/pkg/consensus/cache.go b/pkg/consensus/cache.go index 3ff86ff04..4a6853803 100644 --- a/pkg/consensus/cache.go +++ b/pkg/consensus/cache.go @@ -4,7 +4,7 @@ import ( "container/list" "sync" - "github.com/CityOfZion/neo-go/pkg/util" + "github.com/nspcc-dev/neo-go/pkg/util" ) // relayCache is a payload cache which is used to store diff --git a/pkg/consensus/change_view.go b/pkg/consensus/change_view.go index 6c7702c45..30ecf4eb0 100644 --- a/pkg/consensus/change_view.go +++ b/pkg/consensus/change_view.go @@ -1,8 +1,8 @@ package consensus import ( - "github.com/CityOfZion/neo-go/pkg/io" "github.com/nspcc-dev/dbft/payload" + "github.com/nspcc-dev/neo-go/pkg/io" ) // changeView represents dBFT ChangeView message. diff --git a/pkg/consensus/commit.go b/pkg/consensus/commit.go index 2a3c39445..492a1a156 100644 --- a/pkg/consensus/commit.go +++ b/pkg/consensus/commit.go @@ -1,8 +1,8 @@ package consensus import ( - "github.com/CityOfZion/neo-go/pkg/io" "github.com/nspcc-dev/dbft/payload" + "github.com/nspcc-dev/neo-go/pkg/io" ) // commit represents dBFT Commit message. diff --git a/pkg/consensus/consensus.go b/pkg/consensus/consensus.go index d2256f70b..d5abb4501 100644 --- a/pkg/consensus/consensus.go +++ b/pkg/consensus/consensus.go @@ -6,20 +6,20 @@ import ( "sort" "time" - "github.com/CityOfZion/neo-go/config" - "github.com/CityOfZion/neo-go/pkg/core" - coreb "github.com/CityOfZion/neo-go/pkg/core/block" - "github.com/CityOfZion/neo-go/pkg/core/mempool" - "github.com/CityOfZion/neo-go/pkg/core/transaction" - "github.com/CityOfZion/neo-go/pkg/crypto/keys" - "github.com/CityOfZion/neo-go/pkg/smartcontract" - "github.com/CityOfZion/neo-go/pkg/util" - "github.com/CityOfZion/neo-go/pkg/vm/opcode" - "github.com/CityOfZion/neo-go/pkg/wallet" "github.com/nspcc-dev/dbft" "github.com/nspcc-dev/dbft/block" "github.com/nspcc-dev/dbft/crypto" "github.com/nspcc-dev/dbft/payload" + "github.com/nspcc-dev/neo-go/config" + "github.com/nspcc-dev/neo-go/pkg/core" + coreb "github.com/nspcc-dev/neo-go/pkg/core/block" + "github.com/nspcc-dev/neo-go/pkg/core/mempool" + "github.com/nspcc-dev/neo-go/pkg/core/transaction" + "github.com/nspcc-dev/neo-go/pkg/crypto/keys" + "github.com/nspcc-dev/neo-go/pkg/smartcontract" + "github.com/nspcc-dev/neo-go/pkg/util" + "github.com/nspcc-dev/neo-go/pkg/vm/opcode" + "github.com/nspcc-dev/neo-go/pkg/wallet" "go.uber.org/zap" ) @@ -446,7 +446,7 @@ func (s *service) getVerifiedTx(count int) []block.Transaction { pk := s.dbft.Pub.(*publicKey) sh = pk.GetScriptHash() } - txOuts = []transaction.Output{transaction.Output{ + txOuts = []transaction.Output{{ AssetID: core.UtilityTokenID(), Amount: netFee, ScriptHash: sh, diff --git a/pkg/consensus/consensus_test.go b/pkg/consensus/consensus_test.go index 7243bce01..c5304b987 100644 --- a/pkg/consensus/consensus_test.go +++ b/pkg/consensus/consensus_test.go @@ -3,14 +3,14 @@ package consensus import ( "testing" - "github.com/CityOfZion/neo-go/config" - "github.com/CityOfZion/neo-go/pkg/core" - "github.com/CityOfZion/neo-go/pkg/core/storage" - "github.com/CityOfZion/neo-go/pkg/core/transaction" - "github.com/CityOfZion/neo-go/pkg/crypto/keys" - "github.com/CityOfZion/neo-go/pkg/util" "github.com/nspcc-dev/dbft/block" "github.com/nspcc-dev/dbft/payload" + "github.com/nspcc-dev/neo-go/config" + "github.com/nspcc-dev/neo-go/pkg/core" + "github.com/nspcc-dev/neo-go/pkg/core/storage" + "github.com/nspcc-dev/neo-go/pkg/core/transaction" + "github.com/nspcc-dev/neo-go/pkg/crypto/keys" + "github.com/nspcc-dev/neo-go/pkg/util" "github.com/stretchr/testify/require" "go.uber.org/zap/zaptest" ) diff --git a/pkg/consensus/crypto.go b/pkg/consensus/crypto.go index 4088a64c9..795a38797 100644 --- a/pkg/consensus/crypto.go +++ b/pkg/consensus/crypto.go @@ -4,7 +4,7 @@ import ( "crypto/sha256" "errors" - "github.com/CityOfZion/neo-go/pkg/crypto/keys" + "github.com/nspcc-dev/neo-go/pkg/crypto/keys" ) // privateKey is a wrapper around keys.PrivateKey diff --git a/pkg/consensus/crypto_test.go b/pkg/consensus/crypto_test.go index 9c7405343..2f6bd10ac 100644 --- a/pkg/consensus/crypto_test.go +++ b/pkg/consensus/crypto_test.go @@ -3,7 +3,7 @@ package consensus import ( "testing" - "github.com/CityOfZion/neo-go/pkg/crypto/keys" + "github.com/nspcc-dev/neo-go/pkg/crypto/keys" "github.com/stretchr/testify/require" ) diff --git a/pkg/consensus/payload.go b/pkg/consensus/payload.go index 78ab2d8a3..0d9bc8b66 100644 --- a/pkg/consensus/payload.go +++ b/pkg/consensus/payload.go @@ -4,14 +4,14 @@ import ( "crypto/sha256" "fmt" - "github.com/CityOfZion/neo-go/pkg/core" - "github.com/CityOfZion/neo-go/pkg/core/transaction" - "github.com/CityOfZion/neo-go/pkg/crypto/hash" - "github.com/CityOfZion/neo-go/pkg/io" - "github.com/CityOfZion/neo-go/pkg/util" - "github.com/CityOfZion/neo-go/pkg/vm" - "github.com/CityOfZion/neo-go/pkg/vm/opcode" "github.com/nspcc-dev/dbft/payload" + "github.com/nspcc-dev/neo-go/pkg/core" + "github.com/nspcc-dev/neo-go/pkg/core/transaction" + "github.com/nspcc-dev/neo-go/pkg/crypto/hash" + "github.com/nspcc-dev/neo-go/pkg/io" + "github.com/nspcc-dev/neo-go/pkg/util" + "github.com/nspcc-dev/neo-go/pkg/vm" + "github.com/nspcc-dev/neo-go/pkg/vm/opcode" "github.com/pkg/errors" ) diff --git a/pkg/consensus/payload_test.go b/pkg/consensus/payload_test.go index 631388193..9c0c40162 100644 --- a/pkg/consensus/payload_test.go +++ b/pkg/consensus/payload_test.go @@ -7,12 +7,12 @@ import ( "testing" "time" - "github.com/CityOfZion/neo-go/pkg/core/transaction" - "github.com/CityOfZion/neo-go/pkg/crypto/keys" - "github.com/CityOfZion/neo-go/pkg/io" - "github.com/CityOfZion/neo-go/pkg/util" - "github.com/CityOfZion/neo-go/pkg/vm/opcode" "github.com/nspcc-dev/dbft/payload" + "github.com/nspcc-dev/neo-go/pkg/core/transaction" + "github.com/nspcc-dev/neo-go/pkg/crypto/keys" + "github.com/nspcc-dev/neo-go/pkg/io" + "github.com/nspcc-dev/neo-go/pkg/util" + "github.com/nspcc-dev/neo-go/pkg/vm/opcode" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/pkg/consensus/prepare_request.go b/pkg/consensus/prepare_request.go index efc8d53b2..bbc7ce90b 100644 --- a/pkg/consensus/prepare_request.go +++ b/pkg/consensus/prepare_request.go @@ -1,10 +1,10 @@ package consensus import ( - "github.com/CityOfZion/neo-go/pkg/core/transaction" - "github.com/CityOfZion/neo-go/pkg/io" - "github.com/CityOfZion/neo-go/pkg/util" "github.com/nspcc-dev/dbft/payload" + "github.com/nspcc-dev/neo-go/pkg/core/transaction" + "github.com/nspcc-dev/neo-go/pkg/io" + "github.com/nspcc-dev/neo-go/pkg/util" ) // prepareRequest represents dBFT prepareRequest message. diff --git a/pkg/consensus/prepare_request_test.go b/pkg/consensus/prepare_request_test.go index 83b80c3f5..25d34bf68 100644 --- a/pkg/consensus/prepare_request_test.go +++ b/pkg/consensus/prepare_request_test.go @@ -3,7 +3,7 @@ package consensus import ( "testing" - "github.com/CityOfZion/neo-go/pkg/util" + "github.com/nspcc-dev/neo-go/pkg/util" "github.com/stretchr/testify/require" ) diff --git a/pkg/consensus/prepare_response.go b/pkg/consensus/prepare_response.go index 08bbaac72..63b9bd98a 100644 --- a/pkg/consensus/prepare_response.go +++ b/pkg/consensus/prepare_response.go @@ -1,9 +1,9 @@ package consensus import ( - "github.com/CityOfZion/neo-go/pkg/io" - "github.com/CityOfZion/neo-go/pkg/util" "github.com/nspcc-dev/dbft/payload" + "github.com/nspcc-dev/neo-go/pkg/io" + "github.com/nspcc-dev/neo-go/pkg/util" ) // prepareResponse represents dBFT PrepareResponse message. diff --git a/pkg/consensus/prepare_response_test.go b/pkg/consensus/prepare_response_test.go index 171a128ea..6139848be 100644 --- a/pkg/consensus/prepare_response_test.go +++ b/pkg/consensus/prepare_response_test.go @@ -3,7 +3,7 @@ package consensus import ( "testing" - "github.com/CityOfZion/neo-go/pkg/util" + "github.com/nspcc-dev/neo-go/pkg/util" "github.com/stretchr/testify/require" ) diff --git a/pkg/consensus/recovery_message.go b/pkg/consensus/recovery_message.go index 55e5ca70d..8bc30e269 100644 --- a/pkg/consensus/recovery_message.go +++ b/pkg/consensus/recovery_message.go @@ -1,10 +1,10 @@ package consensus import ( - "github.com/CityOfZion/neo-go/pkg/io" - "github.com/CityOfZion/neo-go/pkg/util" "github.com/nspcc-dev/dbft/crypto" "github.com/nspcc-dev/dbft/payload" + "github.com/nspcc-dev/neo-go/pkg/io" + "github.com/nspcc-dev/neo-go/pkg/util" "github.com/pkg/errors" ) diff --git a/pkg/consensus/recovery_message_test.go b/pkg/consensus/recovery_message_test.go index 07182701f..ed72f6fbe 100644 --- a/pkg/consensus/recovery_message_test.go +++ b/pkg/consensus/recovery_message_test.go @@ -5,11 +5,11 @@ import ( gio "io" "testing" - "github.com/CityOfZion/neo-go/pkg/crypto/keys" - "github.com/CityOfZion/neo-go/pkg/io" - "github.com/CityOfZion/neo-go/pkg/util" "github.com/nspcc-dev/dbft/crypto" "github.com/nspcc-dev/dbft/payload" + "github.com/nspcc-dev/neo-go/pkg/crypto/keys" + "github.com/nspcc-dev/neo-go/pkg/io" + "github.com/nspcc-dev/neo-go/pkg/util" "github.com/stretchr/testify/require" ) diff --git a/pkg/consensus/recovery_request.go b/pkg/consensus/recovery_request.go index d492279f2..d40c6f9e4 100644 --- a/pkg/consensus/recovery_request.go +++ b/pkg/consensus/recovery_request.go @@ -1,8 +1,8 @@ package consensus import ( - "github.com/CityOfZion/neo-go/pkg/io" "github.com/nspcc-dev/dbft/payload" + "github.com/nspcc-dev/neo-go/pkg/io" ) // recoveryRequest represents dBFT RecoveryRequest message. diff --git a/pkg/core/block/block.go b/pkg/core/block/block.go index 4eb533a8d..37ec73847 100644 --- a/pkg/core/block/block.go +++ b/pkg/core/block/block.go @@ -4,11 +4,11 @@ import ( "errors" "fmt" - "github.com/CityOfZion/neo-go/pkg/core/transaction" - "github.com/CityOfZion/neo-go/pkg/crypto/hash" - "github.com/CityOfZion/neo-go/pkg/io" - "github.com/CityOfZion/neo-go/pkg/util" "github.com/Workiva/go-datastructures/queue" + "github.com/nspcc-dev/neo-go/pkg/core/transaction" + "github.com/nspcc-dev/neo-go/pkg/crypto/hash" + "github.com/nspcc-dev/neo-go/pkg/io" + "github.com/nspcc-dev/neo-go/pkg/util" ) // Block represents one block in the chain. diff --git a/pkg/core/block/block_base.go b/pkg/core/block/block_base.go index 8655ea9ac..e2dc11cbf 100644 --- a/pkg/core/block/block_base.go +++ b/pkg/core/block/block_base.go @@ -3,10 +3,10 @@ package block import ( "fmt" - "github.com/CityOfZion/neo-go/pkg/core/transaction" - "github.com/CityOfZion/neo-go/pkg/crypto/hash" - "github.com/CityOfZion/neo-go/pkg/io" - "github.com/CityOfZion/neo-go/pkg/util" + "github.com/nspcc-dev/neo-go/pkg/core/transaction" + "github.com/nspcc-dev/neo-go/pkg/crypto/hash" + "github.com/nspcc-dev/neo-go/pkg/io" + "github.com/nspcc-dev/neo-go/pkg/util" ) // Base holds the base info of a block diff --git a/pkg/core/block/block_test.go b/pkg/core/block/block_test.go index dc38d11e1..326f2adc1 100644 --- a/pkg/core/block/block_test.go +++ b/pkg/core/block/block_test.go @@ -4,10 +4,10 @@ import ( "encoding/hex" "testing" - "github.com/CityOfZion/neo-go/pkg/core/transaction" - "github.com/CityOfZion/neo-go/pkg/crypto/hash" - "github.com/CityOfZion/neo-go/pkg/encoding/address" - "github.com/CityOfZion/neo-go/pkg/io" + "github.com/nspcc-dev/neo-go/pkg/core/transaction" + "github.com/nspcc-dev/neo-go/pkg/crypto/hash" + "github.com/nspcc-dev/neo-go/pkg/encoding/address" + "github.com/nspcc-dev/neo-go/pkg/io" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/pkg/core/block/header.go b/pkg/core/block/header.go index 98804870c..9b2ad907c 100644 --- a/pkg/core/block/header.go +++ b/pkg/core/block/header.go @@ -3,7 +3,7 @@ package block import ( "fmt" - "github.com/CityOfZion/neo-go/pkg/io" + "github.com/nspcc-dev/neo-go/pkg/io" ) // Header holds the head info of a block. diff --git a/pkg/core/block/header_test.go b/pkg/core/block/header_test.go index d7ea801f5..c7901c287 100644 --- a/pkg/core/block/header_test.go +++ b/pkg/core/block/header_test.go @@ -4,10 +4,10 @@ import ( "testing" "time" - "github.com/CityOfZion/neo-go/pkg/core/transaction" - "github.com/CityOfZion/neo-go/pkg/crypto/hash" - "github.com/CityOfZion/neo-go/pkg/io" - "github.com/CityOfZion/neo-go/pkg/util" + "github.com/nspcc-dev/neo-go/pkg/core/transaction" + "github.com/nspcc-dev/neo-go/pkg/crypto/hash" + "github.com/nspcc-dev/neo-go/pkg/io" + "github.com/nspcc-dev/neo-go/pkg/util" "github.com/stretchr/testify/assert" ) diff --git a/pkg/core/block/helper_test.go b/pkg/core/block/helper_test.go index 8f3821cc6..92c8c88b0 100644 --- a/pkg/core/block/helper_test.go +++ b/pkg/core/block/helper_test.go @@ -7,7 +7,7 @@ import ( "io/ioutil" "testing" - "github.com/CityOfZion/neo-go/pkg/io" + "github.com/nspcc-dev/neo-go/pkg/io" "github.com/stretchr/testify/require" ) diff --git a/pkg/core/blockchain.go b/pkg/core/blockchain.go index bb73152c7..d452bc8a3 100644 --- a/pkg/core/blockchain.go +++ b/pkg/core/blockchain.go @@ -9,19 +9,19 @@ import ( "sync/atomic" "time" - "github.com/CityOfZion/neo-go/config" - "github.com/CityOfZion/neo-go/pkg/core/block" - "github.com/CityOfZion/neo-go/pkg/core/mempool" - "github.com/CityOfZion/neo-go/pkg/core/state" - "github.com/CityOfZion/neo-go/pkg/core/storage" - "github.com/CityOfZion/neo-go/pkg/core/transaction" - "github.com/CityOfZion/neo-go/pkg/crypto/keys" - "github.com/CityOfZion/neo-go/pkg/io" - "github.com/CityOfZion/neo-go/pkg/smartcontract" - "github.com/CityOfZion/neo-go/pkg/smartcontract/trigger" - "github.com/CityOfZion/neo-go/pkg/util" - "github.com/CityOfZion/neo-go/pkg/vm" - "github.com/CityOfZion/neo-go/pkg/vm/emit" + "github.com/nspcc-dev/neo-go/config" + "github.com/nspcc-dev/neo-go/pkg/core/block" + "github.com/nspcc-dev/neo-go/pkg/core/mempool" + "github.com/nspcc-dev/neo-go/pkg/core/state" + "github.com/nspcc-dev/neo-go/pkg/core/storage" + "github.com/nspcc-dev/neo-go/pkg/core/transaction" + "github.com/nspcc-dev/neo-go/pkg/crypto/keys" + "github.com/nspcc-dev/neo-go/pkg/io" + "github.com/nspcc-dev/neo-go/pkg/smartcontract" + "github.com/nspcc-dev/neo-go/pkg/smartcontract/trigger" + "github.com/nspcc-dev/neo-go/pkg/util" + "github.com/nspcc-dev/neo-go/pkg/vm" + "github.com/nspcc-dev/neo-go/pkg/vm/emit" "github.com/pkg/errors" "go.uber.org/zap" ) diff --git a/pkg/core/blockchain_test.go b/pkg/core/blockchain_test.go index 168dd0fc8..be2f5ccef 100644 --- a/pkg/core/blockchain_test.go +++ b/pkg/core/blockchain_test.go @@ -3,12 +3,12 @@ package core import ( "testing" - "github.com/CityOfZion/neo-go/pkg/core/block" - "github.com/CityOfZion/neo-go/pkg/core/storage" - "github.com/CityOfZion/neo-go/pkg/core/transaction" - "github.com/CityOfZion/neo-go/pkg/crypto/hash" - "github.com/CityOfZion/neo-go/pkg/io" - "github.com/CityOfZion/neo-go/pkg/util" + "github.com/nspcc-dev/neo-go/pkg/core/block" + "github.com/nspcc-dev/neo-go/pkg/core/storage" + "github.com/nspcc-dev/neo-go/pkg/core/transaction" + "github.com/nspcc-dev/neo-go/pkg/crypto/hash" + "github.com/nspcc-dev/neo-go/pkg/io" + "github.com/nspcc-dev/neo-go/pkg/util" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/pkg/core/blockchainer.go b/pkg/core/blockchainer.go index d5368dd28..968ab66a0 100644 --- a/pkg/core/blockchainer.go +++ b/pkg/core/blockchainer.go @@ -1,15 +1,15 @@ package core import ( - "github.com/CityOfZion/neo-go/config" - "github.com/CityOfZion/neo-go/pkg/core/block" - "github.com/CityOfZion/neo-go/pkg/core/mempool" - "github.com/CityOfZion/neo-go/pkg/core/state" - "github.com/CityOfZion/neo-go/pkg/core/storage" - "github.com/CityOfZion/neo-go/pkg/core/transaction" - "github.com/CityOfZion/neo-go/pkg/crypto/keys" - "github.com/CityOfZion/neo-go/pkg/util" - "github.com/CityOfZion/neo-go/pkg/vm" + "github.com/nspcc-dev/neo-go/config" + "github.com/nspcc-dev/neo-go/pkg/core/block" + "github.com/nspcc-dev/neo-go/pkg/core/mempool" + "github.com/nspcc-dev/neo-go/pkg/core/state" + "github.com/nspcc-dev/neo-go/pkg/core/storage" + "github.com/nspcc-dev/neo-go/pkg/core/transaction" + "github.com/nspcc-dev/neo-go/pkg/crypto/keys" + "github.com/nspcc-dev/neo-go/pkg/util" + "github.com/nspcc-dev/neo-go/pkg/vm" ) // Blockchainer is an interface that abstract the implementation diff --git a/pkg/core/cacheddao.go b/pkg/core/cacheddao.go index d58acdedf..65e61c362 100644 --- a/pkg/core/cacheddao.go +++ b/pkg/core/cacheddao.go @@ -1,9 +1,9 @@ package core import ( - "github.com/CityOfZion/neo-go/pkg/core/state" - "github.com/CityOfZion/neo-go/pkg/core/storage" - "github.com/CityOfZion/neo-go/pkg/util" + "github.com/nspcc-dev/neo-go/pkg/core/state" + "github.com/nspcc-dev/neo-go/pkg/core/storage" + "github.com/nspcc-dev/neo-go/pkg/util" ) // cachedDao is a data access object that mimics dao, but has a write cache diff --git a/pkg/core/cacheddao_test.go b/pkg/core/cacheddao_test.go index 9020fc73e..eab33348c 100644 --- a/pkg/core/cacheddao_test.go +++ b/pkg/core/cacheddao_test.go @@ -3,11 +3,11 @@ package core import ( "testing" - "github.com/CityOfZion/neo-go/pkg/core/state" - "github.com/CityOfZion/neo-go/pkg/core/storage" - "github.com/CityOfZion/neo-go/pkg/crypto/hash" - "github.com/CityOfZion/neo-go/pkg/internal/random" - "github.com/CityOfZion/neo-go/pkg/smartcontract" + "github.com/nspcc-dev/neo-go/pkg/core/state" + "github.com/nspcc-dev/neo-go/pkg/core/storage" + "github.com/nspcc-dev/neo-go/pkg/crypto/hash" + "github.com/nspcc-dev/neo-go/pkg/internal/random" + "github.com/nspcc-dev/neo-go/pkg/smartcontract" "github.com/stretchr/testify/require" ) diff --git a/pkg/core/dao.go b/pkg/core/dao.go index 124316abe..34e4dab1e 100644 --- a/pkg/core/dao.go +++ b/pkg/core/dao.go @@ -6,13 +6,13 @@ import ( "fmt" "sort" - "github.com/CityOfZion/neo-go/pkg/core/block" - "github.com/CityOfZion/neo-go/pkg/core/state" - "github.com/CityOfZion/neo-go/pkg/core/storage" - "github.com/CityOfZion/neo-go/pkg/core/transaction" - "github.com/CityOfZion/neo-go/pkg/crypto/keys" - "github.com/CityOfZion/neo-go/pkg/io" - "github.com/CityOfZion/neo-go/pkg/util" + "github.com/nspcc-dev/neo-go/pkg/core/block" + "github.com/nspcc-dev/neo-go/pkg/core/state" + "github.com/nspcc-dev/neo-go/pkg/core/storage" + "github.com/nspcc-dev/neo-go/pkg/core/transaction" + "github.com/nspcc-dev/neo-go/pkg/crypto/keys" + "github.com/nspcc-dev/neo-go/pkg/io" + "github.com/nspcc-dev/neo-go/pkg/util" ) // dao is a data access object. diff --git a/pkg/core/dao_test.go b/pkg/core/dao_test.go index da2964c45..a854265ff 100644 --- a/pkg/core/dao_test.go +++ b/pkg/core/dao_test.go @@ -3,15 +3,15 @@ package core import ( "testing" - "github.com/CityOfZion/neo-go/pkg/core/block" - "github.com/CityOfZion/neo-go/pkg/core/state" - "github.com/CityOfZion/neo-go/pkg/core/storage" - "github.com/CityOfZion/neo-go/pkg/core/transaction" - "github.com/CityOfZion/neo-go/pkg/crypto/keys" - "github.com/CityOfZion/neo-go/pkg/internal/random" - "github.com/CityOfZion/neo-go/pkg/io" - "github.com/CityOfZion/neo-go/pkg/smartcontract" - "github.com/CityOfZion/neo-go/pkg/vm/opcode" + "github.com/nspcc-dev/neo-go/pkg/core/block" + "github.com/nspcc-dev/neo-go/pkg/core/state" + "github.com/nspcc-dev/neo-go/pkg/core/storage" + "github.com/nspcc-dev/neo-go/pkg/core/transaction" + "github.com/nspcc-dev/neo-go/pkg/crypto/keys" + "github.com/nspcc-dev/neo-go/pkg/internal/random" + "github.com/nspcc-dev/neo-go/pkg/io" + "github.com/nspcc-dev/neo-go/pkg/smartcontract" + "github.com/nspcc-dev/neo-go/pkg/vm/opcode" "github.com/stretchr/testify/require" ) diff --git a/pkg/core/gas_price.go b/pkg/core/gas_price.go index cbed653ee..036dc0cbb 100644 --- a/pkg/core/gas_price.go +++ b/pkg/core/gas_price.go @@ -1,10 +1,10 @@ package core import ( - "github.com/CityOfZion/neo-go/pkg/smartcontract" - "github.com/CityOfZion/neo-go/pkg/util" - "github.com/CityOfZion/neo-go/pkg/vm" - "github.com/CityOfZion/neo-go/pkg/vm/opcode" + "github.com/nspcc-dev/neo-go/pkg/smartcontract" + "github.com/nspcc-dev/neo-go/pkg/util" + "github.com/nspcc-dev/neo-go/pkg/vm" + "github.com/nspcc-dev/neo-go/pkg/vm/opcode" ) // interopGasRatio is a multiplier by which a number returned from price getter diff --git a/pkg/core/gas_price_test.go b/pkg/core/gas_price_test.go index ab41c9e46..f3331527e 100644 --- a/pkg/core/gas_price_test.go +++ b/pkg/core/gas_price_test.go @@ -3,10 +3,10 @@ package core import ( "testing" - "github.com/CityOfZion/neo-go/pkg/core/storage" - "github.com/CityOfZion/neo-go/pkg/smartcontract/trigger" - "github.com/CityOfZion/neo-go/pkg/util" - "github.com/CityOfZion/neo-go/pkg/vm" + "github.com/nspcc-dev/neo-go/pkg/core/storage" + "github.com/nspcc-dev/neo-go/pkg/smartcontract/trigger" + "github.com/nspcc-dev/neo-go/pkg/util" + "github.com/nspcc-dev/neo-go/pkg/vm" "github.com/stretchr/testify/require" ) diff --git a/pkg/core/header_hash_list.go b/pkg/core/header_hash_list.go index 1a4b2fc05..193566942 100644 --- a/pkg/core/header_hash_list.go +++ b/pkg/core/header_hash_list.go @@ -1,8 +1,8 @@ package core import ( - "github.com/CityOfZion/neo-go/pkg/io" - "github.com/CityOfZion/neo-go/pkg/util" + "github.com/nspcc-dev/neo-go/pkg/io" + "github.com/nspcc-dev/neo-go/pkg/util" ) // A HeaderHashList represents a list of header hashes. diff --git a/pkg/core/helper_test.go b/pkg/core/helper_test.go index 4ec207744..eb171e599 100644 --- a/pkg/core/helper_test.go +++ b/pkg/core/helper_test.go @@ -9,18 +9,18 @@ import ( "testing" "time" - "github.com/CityOfZion/neo-go/config" - "github.com/CityOfZion/neo-go/pkg/core/block" - "github.com/CityOfZion/neo-go/pkg/core/storage" - "github.com/CityOfZion/neo-go/pkg/core/transaction" - "github.com/CityOfZion/neo-go/pkg/crypto/hash" - "github.com/CityOfZion/neo-go/pkg/crypto/keys" - "github.com/CityOfZion/neo-go/pkg/io" - "github.com/CityOfZion/neo-go/pkg/smartcontract" - "github.com/CityOfZion/neo-go/pkg/util" - "github.com/CityOfZion/neo-go/pkg/vm/emit" - "github.com/CityOfZion/neo-go/pkg/vm/opcode" - "github.com/CityOfZion/neo-go/pkg/wallet" + "github.com/nspcc-dev/neo-go/config" + "github.com/nspcc-dev/neo-go/pkg/core/block" + "github.com/nspcc-dev/neo-go/pkg/core/storage" + "github.com/nspcc-dev/neo-go/pkg/core/transaction" + "github.com/nspcc-dev/neo-go/pkg/crypto/hash" + "github.com/nspcc-dev/neo-go/pkg/crypto/keys" + "github.com/nspcc-dev/neo-go/pkg/io" + "github.com/nspcc-dev/neo-go/pkg/smartcontract" + "github.com/nspcc-dev/neo-go/pkg/util" + "github.com/nspcc-dev/neo-go/pkg/vm/emit" + "github.com/nspcc-dev/neo-go/pkg/vm/opcode" + "github.com/nspcc-dev/neo-go/pkg/wallet" "github.com/stretchr/testify/require" "go.uber.org/zap/zaptest" ) diff --git a/pkg/core/interop_neo.go b/pkg/core/interop_neo.go index 1eb8e9b3c..a8ed517e5 100644 --- a/pkg/core/interop_neo.go +++ b/pkg/core/interop_neo.go @@ -6,13 +6,13 @@ import ( "math" "strings" - "github.com/CityOfZion/neo-go/pkg/core/state" - "github.com/CityOfZion/neo-go/pkg/core/transaction" - "github.com/CityOfZion/neo-go/pkg/crypto/keys" - "github.com/CityOfZion/neo-go/pkg/smartcontract" - "github.com/CityOfZion/neo-go/pkg/smartcontract/trigger" - "github.com/CityOfZion/neo-go/pkg/util" - "github.com/CityOfZion/neo-go/pkg/vm" + "github.com/nspcc-dev/neo-go/pkg/core/state" + "github.com/nspcc-dev/neo-go/pkg/core/transaction" + "github.com/nspcc-dev/neo-go/pkg/crypto/keys" + "github.com/nspcc-dev/neo-go/pkg/smartcontract" + "github.com/nspcc-dev/neo-go/pkg/smartcontract/trigger" + "github.com/nspcc-dev/neo-go/pkg/util" + "github.com/nspcc-dev/neo-go/pkg/vm" gherr "github.com/pkg/errors" ) diff --git a/pkg/core/interop_neo_test.go b/pkg/core/interop_neo_test.go index b8cb38ac1..e83d012b9 100644 --- a/pkg/core/interop_neo_test.go +++ b/pkg/core/interop_neo_test.go @@ -4,17 +4,17 @@ import ( "math/big" "testing" - "github.com/CityOfZion/neo-go/pkg/core/block" - "github.com/CityOfZion/neo-go/pkg/core/state" - "github.com/CityOfZion/neo-go/pkg/core/storage" - "github.com/CityOfZion/neo-go/pkg/core/transaction" - "github.com/CityOfZion/neo-go/pkg/crypto/keys" - "github.com/CityOfZion/neo-go/pkg/internal/random" - "github.com/CityOfZion/neo-go/pkg/smartcontract" - "github.com/CityOfZion/neo-go/pkg/smartcontract/trigger" - "github.com/CityOfZion/neo-go/pkg/util" - "github.com/CityOfZion/neo-go/pkg/vm" - "github.com/CityOfZion/neo-go/pkg/vm/opcode" + "github.com/nspcc-dev/neo-go/pkg/core/block" + "github.com/nspcc-dev/neo-go/pkg/core/state" + "github.com/nspcc-dev/neo-go/pkg/core/storage" + "github.com/nspcc-dev/neo-go/pkg/core/transaction" + "github.com/nspcc-dev/neo-go/pkg/crypto/keys" + "github.com/nspcc-dev/neo-go/pkg/internal/random" + "github.com/nspcc-dev/neo-go/pkg/smartcontract" + "github.com/nspcc-dev/neo-go/pkg/smartcontract/trigger" + "github.com/nspcc-dev/neo-go/pkg/util" + "github.com/nspcc-dev/neo-go/pkg/vm" + "github.com/nspcc-dev/neo-go/pkg/vm/opcode" "github.com/stretchr/testify/require" ) diff --git a/pkg/core/interop_system.go b/pkg/core/interop_system.go index 462b4ae91..81ea87299 100644 --- a/pkg/core/interop_system.go +++ b/pkg/core/interop_system.go @@ -5,13 +5,13 @@ import ( "fmt" "math" - "github.com/CityOfZion/neo-go/pkg/core/block" - "github.com/CityOfZion/neo-go/pkg/core/state" - "github.com/CityOfZion/neo-go/pkg/core/transaction" - "github.com/CityOfZion/neo-go/pkg/crypto/keys" - "github.com/CityOfZion/neo-go/pkg/smartcontract/trigger" - "github.com/CityOfZion/neo-go/pkg/util" - "github.com/CityOfZion/neo-go/pkg/vm" + "github.com/nspcc-dev/neo-go/pkg/core/block" + "github.com/nspcc-dev/neo-go/pkg/core/state" + "github.com/nspcc-dev/neo-go/pkg/core/transaction" + "github.com/nspcc-dev/neo-go/pkg/crypto/keys" + "github.com/nspcc-dev/neo-go/pkg/smartcontract/trigger" + "github.com/nspcc-dev/neo-go/pkg/util" + "github.com/nspcc-dev/neo-go/pkg/vm" gherr "github.com/pkg/errors" "go.uber.org/zap" ) diff --git a/pkg/core/interops.go b/pkg/core/interops.go index 8ec6e7a66..14b5eae95 100644 --- a/pkg/core/interops.go +++ b/pkg/core/interops.go @@ -10,12 +10,12 @@ package core import ( "sort" - "github.com/CityOfZion/neo-go/pkg/core/block" - "github.com/CityOfZion/neo-go/pkg/core/state" - "github.com/CityOfZion/neo-go/pkg/core/storage" - "github.com/CityOfZion/neo-go/pkg/core/transaction" - "github.com/CityOfZion/neo-go/pkg/smartcontract/trigger" - "github.com/CityOfZion/neo-go/pkg/vm" + "github.com/nspcc-dev/neo-go/pkg/core/block" + "github.com/nspcc-dev/neo-go/pkg/core/state" + "github.com/nspcc-dev/neo-go/pkg/core/storage" + "github.com/nspcc-dev/neo-go/pkg/core/transaction" + "github.com/nspcc-dev/neo-go/pkg/smartcontract/trigger" + "github.com/nspcc-dev/neo-go/pkg/vm" "go.uber.org/zap" ) diff --git a/pkg/core/interops_test.go b/pkg/core/interops_test.go index ab45d6dbd..feefe56bb 100644 --- a/pkg/core/interops_test.go +++ b/pkg/core/interops_test.go @@ -5,9 +5,9 @@ import ( "runtime" "testing" - "github.com/CityOfZion/neo-go/pkg/core/storage" - "github.com/CityOfZion/neo-go/pkg/smartcontract/trigger" - "github.com/CityOfZion/neo-go/pkg/vm" + "github.com/nspcc-dev/neo-go/pkg/core/storage" + "github.com/nspcc-dev/neo-go/pkg/smartcontract/trigger" + "github.com/nspcc-dev/neo-go/pkg/vm" "github.com/stretchr/testify/require" ) diff --git a/pkg/core/mempool/feer.go b/pkg/core/mempool/feer.go index 74b3fb036..89b63dab5 100644 --- a/pkg/core/mempool/feer.go +++ b/pkg/core/mempool/feer.go @@ -1,8 +1,8 @@ package mempool import ( - "github.com/CityOfZion/neo-go/pkg/core/transaction" - "github.com/CityOfZion/neo-go/pkg/util" + "github.com/nspcc-dev/neo-go/pkg/core/transaction" + "github.com/nspcc-dev/neo-go/pkg/util" ) // Feer is an interface that abstract the implementation of the fee calculation. diff --git a/pkg/core/mempool/mem_pool.go b/pkg/core/mempool/mem_pool.go index 09b30bc29..5f9fe82ed 100644 --- a/pkg/core/mempool/mem_pool.go +++ b/pkg/core/mempool/mem_pool.go @@ -6,8 +6,8 @@ import ( "sync" "time" - "github.com/CityOfZion/neo-go/pkg/core/transaction" - "github.com/CityOfZion/neo-go/pkg/util" + "github.com/nspcc-dev/neo-go/pkg/core/transaction" + "github.com/nspcc-dev/neo-go/pkg/util" ) var ( diff --git a/pkg/core/mempool/mem_pool_test.go b/pkg/core/mempool/mem_pool_test.go index 6c1e1fe79..315361bb3 100644 --- a/pkg/core/mempool/mem_pool_test.go +++ b/pkg/core/mempool/mem_pool_test.go @@ -4,9 +4,9 @@ import ( "sort" "testing" - "github.com/CityOfZion/neo-go/pkg/core/transaction" - "github.com/CityOfZion/neo-go/pkg/internal/random" - "github.com/CityOfZion/neo-go/pkg/util" + "github.com/nspcc-dev/neo-go/pkg/core/transaction" + "github.com/nspcc-dev/neo-go/pkg/internal/random" + "github.com/nspcc-dev/neo-go/pkg/util" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/pkg/core/spent_coin_state.go b/pkg/core/spent_coin_state.go index 53cbb8eee..b7702f9c6 100644 --- a/pkg/core/spent_coin_state.go +++ b/pkg/core/spent_coin_state.go @@ -1,9 +1,9 @@ package core import ( - "github.com/CityOfZion/neo-go/pkg/core/transaction" - "github.com/CityOfZion/neo-go/pkg/io" - "github.com/CityOfZion/neo-go/pkg/util" + "github.com/nspcc-dev/neo-go/pkg/core/transaction" + "github.com/nspcc-dev/neo-go/pkg/io" + "github.com/nspcc-dev/neo-go/pkg/util" ) // SpentCoinState represents the state of a spent coin. diff --git a/pkg/core/spent_coin_state_test.go b/pkg/core/spent_coin_state_test.go index ec8176130..b6a289974 100644 --- a/pkg/core/spent_coin_state_test.go +++ b/pkg/core/spent_coin_state_test.go @@ -3,8 +3,8 @@ package core import ( "testing" - "github.com/CityOfZion/neo-go/pkg/internal/random" - "github.com/CityOfZion/neo-go/pkg/io" + "github.com/nspcc-dev/neo-go/pkg/internal/random" + "github.com/nspcc-dev/neo-go/pkg/io" "github.com/stretchr/testify/assert" ) diff --git a/pkg/core/state/account.go b/pkg/core/state/account.go index cbb07dac0..828ce5bcc 100644 --- a/pkg/core/state/account.go +++ b/pkg/core/state/account.go @@ -1,9 +1,9 @@ package state import ( - "github.com/CityOfZion/neo-go/pkg/crypto/keys" - "github.com/CityOfZion/neo-go/pkg/io" - "github.com/CityOfZion/neo-go/pkg/util" + "github.com/nspcc-dev/neo-go/pkg/crypto/keys" + "github.com/nspcc-dev/neo-go/pkg/io" + "github.com/nspcc-dev/neo-go/pkg/util" ) // UnspentBalance contains input/output transactons that sum up into the diff --git a/pkg/core/state/account_test.go b/pkg/core/state/account_test.go index 3981222f7..24d0ac457 100644 --- a/pkg/core/state/account_test.go +++ b/pkg/core/state/account_test.go @@ -3,10 +3,10 @@ package state import ( "testing" - "github.com/CityOfZion/neo-go/pkg/crypto/keys" - "github.com/CityOfZion/neo-go/pkg/internal/random" - "github.com/CityOfZion/neo-go/pkg/io" - "github.com/CityOfZion/neo-go/pkg/util" + "github.com/nspcc-dev/neo-go/pkg/crypto/keys" + "github.com/nspcc-dev/neo-go/pkg/internal/random" + "github.com/nspcc-dev/neo-go/pkg/io" + "github.com/nspcc-dev/neo-go/pkg/util" "github.com/stretchr/testify/assert" ) diff --git a/pkg/core/state/asset.go b/pkg/core/state/asset.go index 6ecfd6dd5..0b624516b 100644 --- a/pkg/core/state/asset.go +++ b/pkg/core/state/asset.go @@ -1,10 +1,10 @@ package state import ( - "github.com/CityOfZion/neo-go/pkg/core/transaction" - "github.com/CityOfZion/neo-go/pkg/crypto/keys" - "github.com/CityOfZion/neo-go/pkg/io" - "github.com/CityOfZion/neo-go/pkg/util" + "github.com/nspcc-dev/neo-go/pkg/core/transaction" + "github.com/nspcc-dev/neo-go/pkg/crypto/keys" + "github.com/nspcc-dev/neo-go/pkg/io" + "github.com/nspcc-dev/neo-go/pkg/util" ) const feeMode = 0x0 diff --git a/pkg/core/state/asset_test.go b/pkg/core/state/asset_test.go index 5a0a1daed..75226c16e 100644 --- a/pkg/core/state/asset_test.go +++ b/pkg/core/state/asset_test.go @@ -3,11 +3,11 @@ package state import ( "testing" - "github.com/CityOfZion/neo-go/pkg/core/transaction" - "github.com/CityOfZion/neo-go/pkg/crypto/keys" - "github.com/CityOfZion/neo-go/pkg/internal/random" - "github.com/CityOfZion/neo-go/pkg/io" - "github.com/CityOfZion/neo-go/pkg/util" + "github.com/nspcc-dev/neo-go/pkg/core/transaction" + "github.com/nspcc-dev/neo-go/pkg/crypto/keys" + "github.com/nspcc-dev/neo-go/pkg/internal/random" + "github.com/nspcc-dev/neo-go/pkg/io" + "github.com/nspcc-dev/neo-go/pkg/util" "github.com/stretchr/testify/assert" ) diff --git a/pkg/core/state/contract.go b/pkg/core/state/contract.go index 6370b2f09..33e791fd3 100644 --- a/pkg/core/state/contract.go +++ b/pkg/core/state/contract.go @@ -1,10 +1,10 @@ package state import ( - "github.com/CityOfZion/neo-go/pkg/crypto/hash" - "github.com/CityOfZion/neo-go/pkg/io" - "github.com/CityOfZion/neo-go/pkg/smartcontract" - "github.com/CityOfZion/neo-go/pkg/util" + "github.com/nspcc-dev/neo-go/pkg/crypto/hash" + "github.com/nspcc-dev/neo-go/pkg/io" + "github.com/nspcc-dev/neo-go/pkg/smartcontract" + "github.com/nspcc-dev/neo-go/pkg/util" ) // Contract holds information about a smart contract in the NEO blockchain. diff --git a/pkg/core/state/contract_test.go b/pkg/core/state/contract_test.go index 9f57d51e9..902e8439e 100644 --- a/pkg/core/state/contract_test.go +++ b/pkg/core/state/contract_test.go @@ -3,9 +3,9 @@ package state import ( "testing" - "github.com/CityOfZion/neo-go/pkg/crypto/hash" - "github.com/CityOfZion/neo-go/pkg/io" - "github.com/CityOfZion/neo-go/pkg/smartcontract" + "github.com/nspcc-dev/neo-go/pkg/crypto/hash" + "github.com/nspcc-dev/neo-go/pkg/io" + "github.com/nspcc-dev/neo-go/pkg/smartcontract" "github.com/stretchr/testify/assert" ) diff --git a/pkg/core/state/notification_event.go b/pkg/core/state/notification_event.go index 8da4a7d58..24e6659e8 100644 --- a/pkg/core/state/notification_event.go +++ b/pkg/core/state/notification_event.go @@ -1,10 +1,10 @@ package state import ( - "github.com/CityOfZion/neo-go/pkg/io" - "github.com/CityOfZion/neo-go/pkg/smartcontract/trigger" - "github.com/CityOfZion/neo-go/pkg/util" - "github.com/CityOfZion/neo-go/pkg/vm" + "github.com/nspcc-dev/neo-go/pkg/io" + "github.com/nspcc-dev/neo-go/pkg/smartcontract/trigger" + "github.com/nspcc-dev/neo-go/pkg/util" + "github.com/nspcc-dev/neo-go/pkg/vm" ) // NotificationEvent is a tuple of scripthash that emitted the StackItem as a diff --git a/pkg/core/state/notification_event_test.go b/pkg/core/state/notification_event_test.go index 0e92ae898..0f28e2957 100644 --- a/pkg/core/state/notification_event_test.go +++ b/pkg/core/state/notification_event_test.go @@ -3,8 +3,8 @@ package state import ( "testing" - "github.com/CityOfZion/neo-go/pkg/internal/random" - "github.com/CityOfZion/neo-go/pkg/io" + "github.com/nspcc-dev/neo-go/pkg/internal/random" + "github.com/nspcc-dev/neo-go/pkg/io" "github.com/stretchr/testify/assert" ) diff --git a/pkg/core/state/storage_item.go b/pkg/core/state/storage_item.go index 12cd24ad8..95f1f1c6c 100644 --- a/pkg/core/state/storage_item.go +++ b/pkg/core/state/storage_item.go @@ -1,7 +1,7 @@ package state import ( - "github.com/CityOfZion/neo-go/pkg/io" + "github.com/nspcc-dev/neo-go/pkg/io" ) // StorageItem is the value to be stored with read-only flag. diff --git a/pkg/core/state/storage_item_test.go b/pkg/core/state/storage_item_test.go index aeb7a5b80..cbf850cbc 100644 --- a/pkg/core/state/storage_item_test.go +++ b/pkg/core/state/storage_item_test.go @@ -3,7 +3,7 @@ package state import ( "testing" - "github.com/CityOfZion/neo-go/pkg/io" + "github.com/nspcc-dev/neo-go/pkg/io" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/pkg/core/state/validator.go b/pkg/core/state/validator.go index 0fdb73c47..2a2d65fa1 100644 --- a/pkg/core/state/validator.go +++ b/pkg/core/state/validator.go @@ -1,9 +1,9 @@ package state import ( - "github.com/CityOfZion/neo-go/pkg/crypto/keys" - "github.com/CityOfZion/neo-go/pkg/io" - "github.com/CityOfZion/neo-go/pkg/util" + "github.com/nspcc-dev/neo-go/pkg/crypto/keys" + "github.com/nspcc-dev/neo-go/pkg/io" + "github.com/nspcc-dev/neo-go/pkg/util" ) // MaxValidatorsVoted limits the number of validators that one can vote for. diff --git a/pkg/core/state/validator_test.go b/pkg/core/state/validator_test.go index ccd9d18d9..9d104773d 100644 --- a/pkg/core/state/validator_test.go +++ b/pkg/core/state/validator_test.go @@ -4,9 +4,9 @@ import ( "math/big" "testing" - "github.com/CityOfZion/neo-go/pkg/crypto/keys" - "github.com/CityOfZion/neo-go/pkg/io" - "github.com/CityOfZion/neo-go/pkg/util" + "github.com/nspcc-dev/neo-go/pkg/crypto/keys" + "github.com/nspcc-dev/neo-go/pkg/io" + "github.com/nspcc-dev/neo-go/pkg/util" "github.com/stretchr/testify/require" ) diff --git a/pkg/core/storage/boltdb_store.go b/pkg/core/storage/boltdb_store.go index 4d1d10ed3..e1778dd40 100644 --- a/pkg/core/storage/boltdb_store.go +++ b/pkg/core/storage/boltdb_store.go @@ -5,8 +5,8 @@ import ( "fmt" "os" - "github.com/CityOfZion/neo-go/pkg/io" "github.com/etcd-io/bbolt" + "github.com/nspcc-dev/neo-go/pkg/io" "github.com/syndtr/goleveldb/leveldb/util" ) diff --git a/pkg/core/transaction/attribute.go b/pkg/core/transaction/attribute.go index e0923617e..ca4a0ed28 100644 --- a/pkg/core/transaction/attribute.go +++ b/pkg/core/transaction/attribute.go @@ -5,7 +5,7 @@ import ( "encoding/json" "fmt" - "github.com/CityOfZion/neo-go/pkg/io" + "github.com/nspcc-dev/neo-go/pkg/io" ) // Attribute represents a Transaction attribute. diff --git a/pkg/core/transaction/claim.go b/pkg/core/transaction/claim.go index 05f9b1a16..f88d43e35 100644 --- a/pkg/core/transaction/claim.go +++ b/pkg/core/transaction/claim.go @@ -1,7 +1,7 @@ package transaction import ( - "github.com/CityOfZion/neo-go/pkg/io" + "github.com/nspcc-dev/neo-go/pkg/io" ) // ClaimTX represents a claim transaction. diff --git a/pkg/core/transaction/contract.go b/pkg/core/transaction/contract.go index 32e66388f..0444f3546 100644 --- a/pkg/core/transaction/contract.go +++ b/pkg/core/transaction/contract.go @@ -1,7 +1,7 @@ package transaction import ( - "github.com/CityOfZion/neo-go/pkg/io" + "github.com/nspcc-dev/neo-go/pkg/io" ) // ContractTX represents a contract transaction. diff --git a/pkg/core/transaction/contract_test.go b/pkg/core/transaction/contract_test.go index 563e94d30..fe3a7348e 100644 --- a/pkg/core/transaction/contract_test.go +++ b/pkg/core/transaction/contract_test.go @@ -4,7 +4,7 @@ import ( "encoding/hex" "testing" - "github.com/CityOfZion/neo-go/pkg/io" + "github.com/nspcc-dev/neo-go/pkg/io" "github.com/stretchr/testify/assert" ) diff --git a/pkg/core/transaction/enrollment.go b/pkg/core/transaction/enrollment.go index 0d7c8a0e4..cb1bcb501 100644 --- a/pkg/core/transaction/enrollment.go +++ b/pkg/core/transaction/enrollment.go @@ -1,8 +1,8 @@ package transaction import ( - "github.com/CityOfZion/neo-go/pkg/crypto/keys" - "github.com/CityOfZion/neo-go/pkg/io" + "github.com/nspcc-dev/neo-go/pkg/crypto/keys" + "github.com/nspcc-dev/neo-go/pkg/io" ) // EnrollmentTX transaction represents an enrollment form, which indicates diff --git a/pkg/core/transaction/enrollment_test.go b/pkg/core/transaction/enrollment_test.go index a98cec4a4..8e1186d92 100644 --- a/pkg/core/transaction/enrollment_test.go +++ b/pkg/core/transaction/enrollment_test.go @@ -4,7 +4,7 @@ import ( "encoding/hex" "testing" - "github.com/CityOfZion/neo-go/pkg/io" + "github.com/nspcc-dev/neo-go/pkg/io" "github.com/stretchr/testify/assert" ) diff --git a/pkg/core/transaction/helper_test.go b/pkg/core/transaction/helper_test.go index beca5cf6a..b5563f54e 100644 --- a/pkg/core/transaction/helper_test.go +++ b/pkg/core/transaction/helper_test.go @@ -4,7 +4,7 @@ import ( "encoding/hex" "testing" - "github.com/CityOfZion/neo-go/pkg/io" + "github.com/nspcc-dev/neo-go/pkg/io" "github.com/stretchr/testify/assert" ) diff --git a/pkg/core/transaction/input.go b/pkg/core/transaction/input.go index c5b150c25..40462fba2 100644 --- a/pkg/core/transaction/input.go +++ b/pkg/core/transaction/input.go @@ -3,8 +3,8 @@ package transaction import ( "sort" - "github.com/CityOfZion/neo-go/pkg/io" - "github.com/CityOfZion/neo-go/pkg/util" + "github.com/nspcc-dev/neo-go/pkg/io" + "github.com/nspcc-dev/neo-go/pkg/util" ) // Input represents a Transaction input (CoinReference). diff --git a/pkg/core/transaction/input_test.go b/pkg/core/transaction/input_test.go index 0375a4559..c8b9fad06 100644 --- a/pkg/core/transaction/input_test.go +++ b/pkg/core/transaction/input_test.go @@ -3,7 +3,7 @@ package transaction import ( "testing" - "github.com/CityOfZion/neo-go/pkg/util" + "github.com/nspcc-dev/neo-go/pkg/util" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/pkg/core/transaction/invocation.go b/pkg/core/transaction/invocation.go index 58f317fd7..1306dbbe8 100644 --- a/pkg/core/transaction/invocation.go +++ b/pkg/core/transaction/invocation.go @@ -1,8 +1,8 @@ package transaction import ( - "github.com/CityOfZion/neo-go/pkg/io" - "github.com/CityOfZion/neo-go/pkg/util" + "github.com/nspcc-dev/neo-go/pkg/io" + "github.com/nspcc-dev/neo-go/pkg/util" ) // InvocationTX represents a invocation transaction and is used to diff --git a/pkg/core/transaction/issue.go b/pkg/core/transaction/issue.go index 5e09bb171..fec4e6fe9 100644 --- a/pkg/core/transaction/issue.go +++ b/pkg/core/transaction/issue.go @@ -1,7 +1,7 @@ package transaction import ( - "github.com/CityOfZion/neo-go/pkg/io" + "github.com/nspcc-dev/neo-go/pkg/io" ) // IssueTX represents a issue transaction. diff --git a/pkg/core/transaction/miner.go b/pkg/core/transaction/miner.go index 5189d34b6..62320bf56 100644 --- a/pkg/core/transaction/miner.go +++ b/pkg/core/transaction/miner.go @@ -1,7 +1,7 @@ package transaction import ( - "github.com/CityOfZion/neo-go/pkg/io" + "github.com/nspcc-dev/neo-go/pkg/io" ) // MinerTX represents a miner transaction. diff --git a/pkg/core/transaction/miner_test.go b/pkg/core/transaction/miner_test.go index df17374ae..82cf54458 100644 --- a/pkg/core/transaction/miner_test.go +++ b/pkg/core/transaction/miner_test.go @@ -4,7 +4,7 @@ import ( "encoding/hex" "testing" - "github.com/CityOfZion/neo-go/pkg/io" + "github.com/nspcc-dev/neo-go/pkg/io" "github.com/stretchr/testify/assert" ) diff --git a/pkg/core/transaction/output.go b/pkg/core/transaction/output.go index ec9460923..1ee3d3252 100644 --- a/pkg/core/transaction/output.go +++ b/pkg/core/transaction/output.go @@ -3,9 +3,9 @@ package transaction import ( "encoding/json" - "github.com/CityOfZion/neo-go/pkg/encoding/address" - "github.com/CityOfZion/neo-go/pkg/io" - "github.com/CityOfZion/neo-go/pkg/util" + "github.com/nspcc-dev/neo-go/pkg/encoding/address" + "github.com/nspcc-dev/neo-go/pkg/io" + "github.com/nspcc-dev/neo-go/pkg/util" ) // Output represents a Transaction output. diff --git a/pkg/core/transaction/publish.go b/pkg/core/transaction/publish.go index 8e44848e0..2acf80cbd 100644 --- a/pkg/core/transaction/publish.go +++ b/pkg/core/transaction/publish.go @@ -1,8 +1,8 @@ package transaction import ( - "github.com/CityOfZion/neo-go/pkg/io" - "github.com/CityOfZion/neo-go/pkg/smartcontract" + "github.com/nspcc-dev/neo-go/pkg/io" + "github.com/nspcc-dev/neo-go/pkg/smartcontract" ) // PublishTX represents a publish transaction. diff --git a/pkg/core/transaction/register.go b/pkg/core/transaction/register.go index 2c7005bb8..321c5652b 100644 --- a/pkg/core/transaction/register.go +++ b/pkg/core/transaction/register.go @@ -1,9 +1,9 @@ package transaction import ( - "github.com/CityOfZion/neo-go/pkg/crypto/keys" - "github.com/CityOfZion/neo-go/pkg/io" - "github.com/CityOfZion/neo-go/pkg/util" + "github.com/nspcc-dev/neo-go/pkg/crypto/keys" + "github.com/nspcc-dev/neo-go/pkg/io" + "github.com/nspcc-dev/neo-go/pkg/util" ) // RegisterTX represents a register transaction. diff --git a/pkg/core/transaction/register_test.go b/pkg/core/transaction/register_test.go index 4381cb4e8..199614194 100644 --- a/pkg/core/transaction/register_test.go +++ b/pkg/core/transaction/register_test.go @@ -4,10 +4,10 @@ import ( "encoding/hex" "testing" - "github.com/CityOfZion/neo-go/pkg/crypto/keys" - "github.com/CityOfZion/neo-go/pkg/encoding/address" - "github.com/CityOfZion/neo-go/pkg/io" - "github.com/CityOfZion/neo-go/pkg/util" + "github.com/nspcc-dev/neo-go/pkg/crypto/keys" + "github.com/nspcc-dev/neo-go/pkg/encoding/address" + "github.com/nspcc-dev/neo-go/pkg/io" + "github.com/nspcc-dev/neo-go/pkg/util" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/pkg/core/transaction/result.go b/pkg/core/transaction/result.go index 76acee7a2..b5c639bca 100644 --- a/pkg/core/transaction/result.go +++ b/pkg/core/transaction/result.go @@ -1,6 +1,6 @@ package transaction -import "github.com/CityOfZion/neo-go/pkg/util" +import "github.com/nspcc-dev/neo-go/pkg/util" // Result represents the Result of a transaction. type Result struct { diff --git a/pkg/core/transaction/state.go b/pkg/core/transaction/state.go index 76178a205..a3783eb0c 100644 --- a/pkg/core/transaction/state.go +++ b/pkg/core/transaction/state.go @@ -1,7 +1,7 @@ package transaction import ( - "github.com/CityOfZion/neo-go/pkg/io" + "github.com/nspcc-dev/neo-go/pkg/io" ) // StateTX represents a state transaction. diff --git a/pkg/core/transaction/state_descriptor.go b/pkg/core/transaction/state_descriptor.go index 05f0a7f12..85f41a529 100644 --- a/pkg/core/transaction/state_descriptor.go +++ b/pkg/core/transaction/state_descriptor.go @@ -1,7 +1,7 @@ package transaction import ( - "github.com/CityOfZion/neo-go/pkg/io" + "github.com/nspcc-dev/neo-go/pkg/io" ) // DescStateType represents the type of StateDescriptor. diff --git a/pkg/core/transaction/state_test.go b/pkg/core/transaction/state_test.go index 53fb17e7c..568b37bca 100644 --- a/pkg/core/transaction/state_test.go +++ b/pkg/core/transaction/state_test.go @@ -4,7 +4,7 @@ import ( "encoding/hex" "testing" - "github.com/CityOfZion/neo-go/pkg/io" + "github.com/nspcc-dev/neo-go/pkg/io" "github.com/stretchr/testify/assert" ) diff --git a/pkg/core/transaction/transaction.go b/pkg/core/transaction/transaction.go index f20962bc3..adfa9e2dc 100644 --- a/pkg/core/transaction/transaction.go +++ b/pkg/core/transaction/transaction.go @@ -4,9 +4,9 @@ import ( "errors" "fmt" - "github.com/CityOfZion/neo-go/pkg/crypto/hash" - "github.com/CityOfZion/neo-go/pkg/io" - "github.com/CityOfZion/neo-go/pkg/util" + "github.com/nspcc-dev/neo-go/pkg/crypto/hash" + "github.com/nspcc-dev/neo-go/pkg/io" + "github.com/nspcc-dev/neo-go/pkg/util" ) const ( diff --git a/pkg/core/transaction/transaction_test.go b/pkg/core/transaction/transaction_test.go index 7a44dc674..ec410e5aa 100644 --- a/pkg/core/transaction/transaction_test.go +++ b/pkg/core/transaction/transaction_test.go @@ -4,10 +4,10 @@ import ( "encoding/hex" "testing" - "github.com/CityOfZion/neo-go/pkg/encoding/address" - "github.com/CityOfZion/neo-go/pkg/io" - "github.com/CityOfZion/neo-go/pkg/smartcontract" - "github.com/CityOfZion/neo-go/pkg/util" + "github.com/nspcc-dev/neo-go/pkg/encoding/address" + "github.com/nspcc-dev/neo-go/pkg/io" + "github.com/nspcc-dev/neo-go/pkg/smartcontract" + "github.com/nspcc-dev/neo-go/pkg/util" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/pkg/core/transaction/txer.go b/pkg/core/transaction/txer.go index ca612c7fa..f48077f4d 100644 --- a/pkg/core/transaction/txer.go +++ b/pkg/core/transaction/txer.go @@ -1,6 +1,6 @@ package transaction -import "github.com/CityOfZion/neo-go/pkg/io" +import "github.com/nspcc-dev/neo-go/pkg/io" // TXer is interface that can act as the underlying data of // a transaction. diff --git a/pkg/core/transaction/witness.go b/pkg/core/transaction/witness.go index 762838930..501663cd8 100644 --- a/pkg/core/transaction/witness.go +++ b/pkg/core/transaction/witness.go @@ -4,9 +4,9 @@ import ( "encoding/hex" "encoding/json" - "github.com/CityOfZion/neo-go/pkg/crypto/hash" - "github.com/CityOfZion/neo-go/pkg/io" - "github.com/CityOfZion/neo-go/pkg/util" + "github.com/nspcc-dev/neo-go/pkg/crypto/hash" + "github.com/nspcc-dev/neo-go/pkg/io" + "github.com/nspcc-dev/neo-go/pkg/util" ) // Witness contains 2 scripts. diff --git a/pkg/core/unspent_coin_state.go b/pkg/core/unspent_coin_state.go index d522a8650..cbcd6a2e8 100644 --- a/pkg/core/unspent_coin_state.go +++ b/pkg/core/unspent_coin_state.go @@ -1,8 +1,8 @@ package core import ( - "github.com/CityOfZion/neo-go/pkg/core/state" - "github.com/CityOfZion/neo-go/pkg/io" + "github.com/nspcc-dev/neo-go/pkg/core/state" + "github.com/nspcc-dev/neo-go/pkg/io" ) // UnspentCoinState hold the state of a unspent coin. diff --git a/pkg/core/unspent_coint_state_test.go b/pkg/core/unspent_coint_state_test.go index 8864619c6..98e089f58 100644 --- a/pkg/core/unspent_coint_state_test.go +++ b/pkg/core/unspent_coint_state_test.go @@ -3,8 +3,8 @@ package core import ( "testing" - "github.com/CityOfZion/neo-go/pkg/core/state" - "github.com/CityOfZion/neo-go/pkg/io" + "github.com/nspcc-dev/neo-go/pkg/core/state" + "github.com/nspcc-dev/neo-go/pkg/io" "github.com/stretchr/testify/assert" ) diff --git a/pkg/core/util.go b/pkg/core/util.go index 77fcddc22..864f60bd4 100644 --- a/pkg/core/util.go +++ b/pkg/core/util.go @@ -3,14 +3,14 @@ package core import ( "time" - "github.com/CityOfZion/neo-go/config" - "github.com/CityOfZion/neo-go/pkg/core/block" - "github.com/CityOfZion/neo-go/pkg/core/transaction" - "github.com/CityOfZion/neo-go/pkg/crypto/hash" - "github.com/CityOfZion/neo-go/pkg/crypto/keys" - "github.com/CityOfZion/neo-go/pkg/smartcontract" - "github.com/CityOfZion/neo-go/pkg/util" - "github.com/CityOfZion/neo-go/pkg/vm/opcode" + "github.com/nspcc-dev/neo-go/config" + "github.com/nspcc-dev/neo-go/pkg/core/block" + "github.com/nspcc-dev/neo-go/pkg/core/transaction" + "github.com/nspcc-dev/neo-go/pkg/crypto/hash" + "github.com/nspcc-dev/neo-go/pkg/crypto/keys" + "github.com/nspcc-dev/neo-go/pkg/smartcontract" + "github.com/nspcc-dev/neo-go/pkg/util" + "github.com/nspcc-dev/neo-go/pkg/vm/opcode" ) var ( diff --git a/pkg/core/util_test.go b/pkg/core/util_test.go index e4498c35c..ff59855f0 100644 --- a/pkg/core/util_test.go +++ b/pkg/core/util_test.go @@ -3,8 +3,8 @@ package core import ( "testing" - "github.com/CityOfZion/neo-go/config" - "github.com/CityOfZion/neo-go/pkg/encoding/address" + "github.com/nspcc-dev/neo-go/config" + "github.com/nspcc-dev/neo-go/pkg/encoding/address" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/pkg/crypto/hash/hash.go b/pkg/crypto/hash/hash.go index 9be7f65ee..e161e4051 100644 --- a/pkg/crypto/hash/hash.go +++ b/pkg/crypto/hash/hash.go @@ -3,7 +3,7 @@ package hash import ( "crypto/sha256" - "github.com/CityOfZion/neo-go/pkg/util" + "github.com/nspcc-dev/neo-go/pkg/util" "golang.org/x/crypto/ripemd160" ) diff --git a/pkg/crypto/hash/merkle_tree.go b/pkg/crypto/hash/merkle_tree.go index 9d6642efa..b12d244bc 100644 --- a/pkg/crypto/hash/merkle_tree.go +++ b/pkg/crypto/hash/merkle_tree.go @@ -3,7 +3,7 @@ package hash import ( "errors" - "github.com/CityOfZion/neo-go/pkg/util" + "github.com/nspcc-dev/neo-go/pkg/util" ) // MerkleTree implementation. diff --git a/pkg/crypto/hash/merkle_tree_test.go b/pkg/crypto/hash/merkle_tree_test.go index f7cd88dc5..d6494f2d1 100644 --- a/pkg/crypto/hash/merkle_tree_test.go +++ b/pkg/crypto/hash/merkle_tree_test.go @@ -3,7 +3,7 @@ package hash import ( "testing" - "github.com/CityOfZion/neo-go/pkg/util" + "github.com/nspcc-dev/neo-go/pkg/util" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/pkg/crypto/keys/nep2.go b/pkg/crypto/keys/nep2.go index 1f49298d2..505f13dd6 100644 --- a/pkg/crypto/keys/nep2.go +++ b/pkg/crypto/keys/nep2.go @@ -5,8 +5,8 @@ import ( "errors" "fmt" - "github.com/CityOfZion/neo-go/pkg/crypto/hash" - "github.com/CityOfZion/neo-go/pkg/encoding/base58" + "github.com/nspcc-dev/neo-go/pkg/crypto/hash" + "github.com/nspcc-dev/neo-go/pkg/encoding/base58" "golang.org/x/crypto/scrypt" "golang.org/x/text/unicode/norm" ) diff --git a/pkg/crypto/keys/nep2_test.go b/pkg/crypto/keys/nep2_test.go index a12c21447..98e48010d 100644 --- a/pkg/crypto/keys/nep2_test.go +++ b/pkg/crypto/keys/nep2_test.go @@ -3,7 +3,7 @@ package keys import ( "testing" - "github.com/CityOfZion/neo-go/pkg/internal/keytestcases" + "github.com/nspcc-dev/neo-go/pkg/internal/keytestcases" "github.com/stretchr/testify/assert" ) diff --git a/pkg/crypto/keys/private_key.go b/pkg/crypto/keys/private_key.go index bf99021d4..0c2dc7d5b 100644 --- a/pkg/crypto/keys/private_key.go +++ b/pkg/crypto/keys/private_key.go @@ -10,7 +10,7 @@ import ( "fmt" "math/big" - "github.com/CityOfZion/neo-go/pkg/util" + "github.com/nspcc-dev/neo-go/pkg/util" "github.com/nspcc-dev/rfc6979" ) diff --git a/pkg/crypto/keys/private_key_test.go b/pkg/crypto/keys/private_key_test.go index e457cfda2..d8d7c1dc2 100644 --- a/pkg/crypto/keys/private_key_test.go +++ b/pkg/crypto/keys/private_key_test.go @@ -5,7 +5,7 @@ import ( "strings" "testing" - "github.com/CityOfZion/neo-go/pkg/internal/keytestcases" + "github.com/nspcc-dev/neo-go/pkg/internal/keytestcases" "github.com/stretchr/testify/assert" ) diff --git a/pkg/crypto/keys/publickey.go b/pkg/crypto/keys/publickey.go index 60951851e..c03f6dfa3 100644 --- a/pkg/crypto/keys/publickey.go +++ b/pkg/crypto/keys/publickey.go @@ -9,11 +9,11 @@ import ( "fmt" "math/big" - "github.com/CityOfZion/neo-go/pkg/crypto/hash" - "github.com/CityOfZion/neo-go/pkg/encoding/address" - "github.com/CityOfZion/neo-go/pkg/io" - "github.com/CityOfZion/neo-go/pkg/util" - "github.com/CityOfZion/neo-go/pkg/vm/opcode" + "github.com/nspcc-dev/neo-go/pkg/crypto/hash" + "github.com/nspcc-dev/neo-go/pkg/encoding/address" + "github.com/nspcc-dev/neo-go/pkg/io" + "github.com/nspcc-dev/neo-go/pkg/util" + "github.com/nspcc-dev/neo-go/pkg/vm/opcode" "github.com/pkg/errors" ) diff --git a/pkg/crypto/keys/publickey_test.go b/pkg/crypto/keys/publickey_test.go index f4aeb28aa..813798704 100644 --- a/pkg/crypto/keys/publickey_test.go +++ b/pkg/crypto/keys/publickey_test.go @@ -6,7 +6,7 @@ import ( "sort" "testing" - "github.com/CityOfZion/neo-go/pkg/io" + "github.com/nspcc-dev/neo-go/pkg/io" "github.com/stretchr/testify/require" ) diff --git a/pkg/crypto/keys/sign_verify_test.go b/pkg/crypto/keys/sign_verify_test.go index 7ba494947..5241a2cc6 100644 --- a/pkg/crypto/keys/sign_verify_test.go +++ b/pkg/crypto/keys/sign_verify_test.go @@ -3,7 +3,7 @@ package keys import ( "testing" - "github.com/CityOfZion/neo-go/pkg/crypto/hash" + "github.com/nspcc-dev/neo-go/pkg/crypto/hash" "github.com/stretchr/testify/assert" ) diff --git a/pkg/crypto/keys/wif.go b/pkg/crypto/keys/wif.go index e23fbbd3c..b8bf971bb 100644 --- a/pkg/crypto/keys/wif.go +++ b/pkg/crypto/keys/wif.go @@ -4,7 +4,7 @@ import ( "bytes" "fmt" - "github.com/CityOfZion/neo-go/pkg/encoding/base58" + "github.com/nspcc-dev/neo-go/pkg/encoding/base58" ) const ( diff --git a/pkg/encoding/address/address.go b/pkg/encoding/address/address.go index e02cca4ce..fc2ed4425 100644 --- a/pkg/encoding/address/address.go +++ b/pkg/encoding/address/address.go @@ -3,8 +3,8 @@ package address import ( "errors" - "github.com/CityOfZion/neo-go/pkg/encoding/base58" - "github.com/CityOfZion/neo-go/pkg/util" + "github.com/nspcc-dev/neo-go/pkg/encoding/base58" + "github.com/nspcc-dev/neo-go/pkg/util" ) // Prefix is the byte used to prepend to addresses when encoding them, it can diff --git a/pkg/encoding/base58/base58.go b/pkg/encoding/base58/base58.go index 9c7398500..d14503e9c 100644 --- a/pkg/encoding/base58/base58.go +++ b/pkg/encoding/base58/base58.go @@ -3,8 +3,8 @@ package base58 import ( "bytes" - "github.com/CityOfZion/neo-go/pkg/crypto/hash" "github.com/mr-tron/base58" + "github.com/nspcc-dev/neo-go/pkg/crypto/hash" "github.com/pkg/errors" ) diff --git a/pkg/internal/random/random_util.go b/pkg/internal/random/random_util.go index d07e4da50..de602966c 100644 --- a/pkg/internal/random/random_util.go +++ b/pkg/internal/random/random_util.go @@ -4,8 +4,8 @@ import ( "math/rand" "time" - "github.com/CityOfZion/neo-go/pkg/crypto/hash" - "github.com/CityOfZion/neo-go/pkg/util" + "github.com/nspcc-dev/neo-go/pkg/crypto/hash" + "github.com/nspcc-dev/neo-go/pkg/util" ) // String returns a random string with the n as its length. diff --git a/pkg/interop/block/block.go b/pkg/interop/block/block.go index 06191424a..e7171614a 100644 --- a/pkg/interop/block/block.go +++ b/pkg/interop/block/block.go @@ -1,6 +1,6 @@ package block -import "github.com/CityOfZion/neo-go/pkg/interop/transaction" +import "github.com/nspcc-dev/neo-go/pkg/interop/transaction" // Package block provides function signatures that can be used inside // smart contracts that are written in the neo-go framework. diff --git a/pkg/interop/blockchain/blockchain.go b/pkg/interop/blockchain/blockchain.go index d27bdaa07..18ae7216b 100644 --- a/pkg/interop/blockchain/blockchain.go +++ b/pkg/interop/blockchain/blockchain.go @@ -1,12 +1,12 @@ package blockchain import ( - "github.com/CityOfZion/neo-go/pkg/interop/account" - "github.com/CityOfZion/neo-go/pkg/interop/asset" - "github.com/CityOfZion/neo-go/pkg/interop/block" - "github.com/CityOfZion/neo-go/pkg/interop/contract" - "github.com/CityOfZion/neo-go/pkg/interop/header" - "github.com/CityOfZion/neo-go/pkg/interop/transaction" + "github.com/nspcc-dev/neo-go/pkg/interop/account" + "github.com/nspcc-dev/neo-go/pkg/interop/asset" + "github.com/nspcc-dev/neo-go/pkg/interop/block" + "github.com/nspcc-dev/neo-go/pkg/interop/contract" + "github.com/nspcc-dev/neo-go/pkg/interop/header" + "github.com/nspcc-dev/neo-go/pkg/interop/transaction" ) // Package blockchain provides function signatures that can be used inside diff --git a/pkg/interop/contract/contract.go b/pkg/interop/contract/contract.go index 55f60c0ad..f1d6af376 100644 --- a/pkg/interop/contract/contract.go +++ b/pkg/interop/contract/contract.go @@ -1,6 +1,6 @@ package contract -import "github.com/CityOfZion/neo-go/pkg/interop/storage" +import "github.com/nspcc-dev/neo-go/pkg/interop/storage" // Package contract provides function signatures that can be used inside // smart contracts that are written in the neo-go framework. diff --git a/pkg/interop/engine/engine.go b/pkg/interop/engine/engine.go index d094e3a43..06a54e3fc 100644 --- a/pkg/interop/engine/engine.go +++ b/pkg/interop/engine/engine.go @@ -1,6 +1,6 @@ package engine -import "github.com/CityOfZion/neo-go/pkg/interop/transaction" +import "github.com/nspcc-dev/neo-go/pkg/interop/transaction" // Package engine provides function signatures that can be used inside // smart contracts that are written in the neo-go framework. diff --git a/pkg/interop/storage/storage.go b/pkg/interop/storage/storage.go index 96c36b0ab..be0f10bc0 100644 --- a/pkg/interop/storage/storage.go +++ b/pkg/interop/storage/storage.go @@ -1,6 +1,6 @@ package storage -import "github.com/CityOfZion/neo-go/pkg/interop/iterator" +import "github.com/nspcc-dev/neo-go/pkg/interop/iterator" // Package storage provides function signatures that can be used inside // smart contracts that are written in the neo-go framework. diff --git a/pkg/interop/transaction/transaction.go b/pkg/interop/transaction/transaction.go index 1acd54814..1d863f5c3 100644 --- a/pkg/interop/transaction/transaction.go +++ b/pkg/interop/transaction/transaction.go @@ -1,9 +1,9 @@ package transaction import ( - "github.com/CityOfZion/neo-go/pkg/interop/attribute" - "github.com/CityOfZion/neo-go/pkg/interop/input" - "github.com/CityOfZion/neo-go/pkg/interop/output" + "github.com/nspcc-dev/neo-go/pkg/interop/attribute" + "github.com/nspcc-dev/neo-go/pkg/interop/input" + "github.com/nspcc-dev/neo-go/pkg/interop/output" ) // Package transaction provides function signatures that can be used inside diff --git a/pkg/io/size_test.go b/pkg/io/size_test.go index ea5175956..26af4c026 100644 --- a/pkg/io/size_test.go +++ b/pkg/io/size_test.go @@ -4,8 +4,8 @@ import ( "fmt" "testing" - "github.com/CityOfZion/neo-go/pkg/io" - "github.com/CityOfZion/neo-go/pkg/util" + "github.com/nspcc-dev/neo-go/pkg/io" + "github.com/nspcc-dev/neo-go/pkg/util" "github.com/stretchr/testify/assert" ) diff --git a/pkg/network/blockqueue.go b/pkg/network/blockqueue.go index 2911ffced..762e569fa 100644 --- a/pkg/network/blockqueue.go +++ b/pkg/network/blockqueue.go @@ -1,9 +1,9 @@ package network import ( - "github.com/CityOfZion/neo-go/pkg/core" - "github.com/CityOfZion/neo-go/pkg/core/block" "github.com/Workiva/go-datastructures/queue" + "github.com/nspcc-dev/neo-go/pkg/core" + "github.com/nspcc-dev/neo-go/pkg/core/block" "go.uber.org/zap" ) diff --git a/pkg/network/blockqueue_test.go b/pkg/network/blockqueue_test.go index af3540096..7141976cf 100644 --- a/pkg/network/blockqueue_test.go +++ b/pkg/network/blockqueue_test.go @@ -4,7 +4,7 @@ import ( "testing" "time" - "github.com/CityOfZion/neo-go/pkg/core/block" + "github.com/nspcc-dev/neo-go/pkg/core/block" "github.com/stretchr/testify/assert" "go.uber.org/zap/zaptest" ) diff --git a/pkg/network/helper_test.go b/pkg/network/helper_test.go index 3133a9f5c..21161dc0c 100644 --- a/pkg/network/helper_test.go +++ b/pkg/network/helper_test.go @@ -7,18 +7,18 @@ import ( "testing" "time" - "github.com/CityOfZion/neo-go/config" - "github.com/CityOfZion/neo-go/pkg/core" - "github.com/CityOfZion/neo-go/pkg/core/block" - "github.com/CityOfZion/neo-go/pkg/core/mempool" - "github.com/CityOfZion/neo-go/pkg/core/state" - "github.com/CityOfZion/neo-go/pkg/core/storage" - "github.com/CityOfZion/neo-go/pkg/core/transaction" - "github.com/CityOfZion/neo-go/pkg/crypto/keys" - "github.com/CityOfZion/neo-go/pkg/io" - "github.com/CityOfZion/neo-go/pkg/network/payload" - "github.com/CityOfZion/neo-go/pkg/util" - "github.com/CityOfZion/neo-go/pkg/vm" + "github.com/nspcc-dev/neo-go/config" + "github.com/nspcc-dev/neo-go/pkg/core" + "github.com/nspcc-dev/neo-go/pkg/core/block" + "github.com/nspcc-dev/neo-go/pkg/core/mempool" + "github.com/nspcc-dev/neo-go/pkg/core/state" + "github.com/nspcc-dev/neo-go/pkg/core/storage" + "github.com/nspcc-dev/neo-go/pkg/core/transaction" + "github.com/nspcc-dev/neo-go/pkg/crypto/keys" + "github.com/nspcc-dev/neo-go/pkg/io" + "github.com/nspcc-dev/neo-go/pkg/network/payload" + "github.com/nspcc-dev/neo-go/pkg/util" + "github.com/nspcc-dev/neo-go/pkg/vm" "go.uber.org/zap/zaptest" ) diff --git a/pkg/network/message.go b/pkg/network/message.go index 181b52cd5..1d651fd71 100644 --- a/pkg/network/message.go +++ b/pkg/network/message.go @@ -5,13 +5,13 @@ import ( "errors" "fmt" - "github.com/CityOfZion/neo-go/config" - "github.com/CityOfZion/neo-go/pkg/consensus" - "github.com/CityOfZion/neo-go/pkg/core/block" - "github.com/CityOfZion/neo-go/pkg/core/transaction" - "github.com/CityOfZion/neo-go/pkg/crypto/hash" - "github.com/CityOfZion/neo-go/pkg/io" - "github.com/CityOfZion/neo-go/pkg/network/payload" + "github.com/nspcc-dev/neo-go/config" + "github.com/nspcc-dev/neo-go/pkg/consensus" + "github.com/nspcc-dev/neo-go/pkg/core/block" + "github.com/nspcc-dev/neo-go/pkg/core/transaction" + "github.com/nspcc-dev/neo-go/pkg/crypto/hash" + "github.com/nspcc-dev/neo-go/pkg/io" + "github.com/nspcc-dev/neo-go/pkg/network/payload" ) const ( diff --git a/pkg/network/payload/address.go b/pkg/network/payload/address.go index 248c313e2..e3d34ae92 100644 --- a/pkg/network/payload/address.go +++ b/pkg/network/payload/address.go @@ -5,7 +5,7 @@ import ( "strconv" "time" - "github.com/CityOfZion/neo-go/pkg/io" + "github.com/nspcc-dev/neo-go/pkg/io" ) // AddressAndTime payload. diff --git a/pkg/network/payload/address_test.go b/pkg/network/payload/address_test.go index bfd2f2ded..446678280 100644 --- a/pkg/network/payload/address_test.go +++ b/pkg/network/payload/address_test.go @@ -6,7 +6,7 @@ import ( "testing" "time" - "github.com/CityOfZion/neo-go/pkg/io" + "github.com/nspcc-dev/neo-go/pkg/io" "github.com/stretchr/testify/assert" ) diff --git a/pkg/network/payload/getblocks.go b/pkg/network/payload/getblocks.go index 98e2a9c47..5a07d38b4 100644 --- a/pkg/network/payload/getblocks.go +++ b/pkg/network/payload/getblocks.go @@ -1,8 +1,8 @@ package payload import ( - "github.com/CityOfZion/neo-go/pkg/io" - "github.com/CityOfZion/neo-go/pkg/util" + "github.com/nspcc-dev/neo-go/pkg/io" + "github.com/nspcc-dev/neo-go/pkg/util" ) // Maximum inventory hashes number is limited to 500. diff --git a/pkg/network/payload/getblocks_test.go b/pkg/network/payload/getblocks_test.go index dfa35bef0..0ab49bbd4 100644 --- a/pkg/network/payload/getblocks_test.go +++ b/pkg/network/payload/getblocks_test.go @@ -3,9 +3,9 @@ package payload import ( "testing" - "github.com/CityOfZion/neo-go/pkg/crypto/hash" - "github.com/CityOfZion/neo-go/pkg/io" - "github.com/CityOfZion/neo-go/pkg/util" + "github.com/nspcc-dev/neo-go/pkg/crypto/hash" + "github.com/nspcc-dev/neo-go/pkg/io" + "github.com/nspcc-dev/neo-go/pkg/util" "github.com/stretchr/testify/assert" ) diff --git a/pkg/network/payload/headers.go b/pkg/network/payload/headers.go index 1b0ed7fd4..b8abe8162 100644 --- a/pkg/network/payload/headers.go +++ b/pkg/network/payload/headers.go @@ -1,8 +1,8 @@ package payload import ( - "github.com/CityOfZion/neo-go/pkg/core/block" - "github.com/CityOfZion/neo-go/pkg/io" + "github.com/nspcc-dev/neo-go/pkg/core/block" + "github.com/nspcc-dev/neo-go/pkg/io" "github.com/pkg/errors" ) diff --git a/pkg/network/payload/headers_test.go b/pkg/network/payload/headers_test.go index 008804eb0..b4e5056e6 100644 --- a/pkg/network/payload/headers_test.go +++ b/pkg/network/payload/headers_test.go @@ -4,9 +4,9 @@ import ( "encoding/hex" "testing" - "github.com/CityOfZion/neo-go/pkg/core/block" - "github.com/CityOfZion/neo-go/pkg/core/transaction" - "github.com/CityOfZion/neo-go/pkg/io" + "github.com/nspcc-dev/neo-go/pkg/core/block" + "github.com/nspcc-dev/neo-go/pkg/core/transaction" + "github.com/nspcc-dev/neo-go/pkg/io" "github.com/stretchr/testify/assert" ) diff --git a/pkg/network/payload/inventory.go b/pkg/network/payload/inventory.go index b1747719a..d582e0486 100644 --- a/pkg/network/payload/inventory.go +++ b/pkg/network/payload/inventory.go @@ -1,8 +1,8 @@ package payload import ( - "github.com/CityOfZion/neo-go/pkg/io" - "github.com/CityOfZion/neo-go/pkg/util" + "github.com/nspcc-dev/neo-go/pkg/io" + "github.com/nspcc-dev/neo-go/pkg/util" ) // The node can broadcast the object information it owns by this message. diff --git a/pkg/network/payload/inventory_test.go b/pkg/network/payload/inventory_test.go index 5e1d8ea92..41a17e541 100644 --- a/pkg/network/payload/inventory_test.go +++ b/pkg/network/payload/inventory_test.go @@ -3,9 +3,9 @@ package payload import ( "testing" - "github.com/CityOfZion/neo-go/pkg/crypto/hash" - "github.com/CityOfZion/neo-go/pkg/io" - . "github.com/CityOfZion/neo-go/pkg/util" + "github.com/nspcc-dev/neo-go/pkg/crypto/hash" + "github.com/nspcc-dev/neo-go/pkg/io" + . "github.com/nspcc-dev/neo-go/pkg/util" "github.com/stretchr/testify/assert" ) diff --git a/pkg/network/payload/merkleblock.go b/pkg/network/payload/merkleblock.go index 2aa31033e..c208246de 100644 --- a/pkg/network/payload/merkleblock.go +++ b/pkg/network/payload/merkleblock.go @@ -1,9 +1,9 @@ package payload import ( - "github.com/CityOfZion/neo-go/pkg/core/block" - "github.com/CityOfZion/neo-go/pkg/io" - "github.com/CityOfZion/neo-go/pkg/util" + "github.com/nspcc-dev/neo-go/pkg/core/block" + "github.com/nspcc-dev/neo-go/pkg/io" + "github.com/nspcc-dev/neo-go/pkg/util" ) // MerkleBlock represents a merkle block packet payload. diff --git a/pkg/network/payload/payload.go b/pkg/network/payload/payload.go index 112008ffd..0c295b5d1 100644 --- a/pkg/network/payload/payload.go +++ b/pkg/network/payload/payload.go @@ -1,6 +1,6 @@ package payload -import "github.com/CityOfZion/neo-go/pkg/io" +import "github.com/nspcc-dev/neo-go/pkg/io" // Payload is anything that can be binary encoded/decoded. type Payload interface { diff --git a/pkg/network/payload/ping.go b/pkg/network/payload/ping.go index 4444a4824..51af5bf3a 100644 --- a/pkg/network/payload/ping.go +++ b/pkg/network/payload/ping.go @@ -3,7 +3,7 @@ package payload import ( "time" - "github.com/CityOfZion/neo-go/pkg/io" + "github.com/nspcc-dev/neo-go/pkg/io" ) // Ping payload for ping/pong payloads. diff --git a/pkg/network/payload/ping_test.go b/pkg/network/payload/ping_test.go index c9f8678b8..6c71ab451 100644 --- a/pkg/network/payload/ping_test.go +++ b/pkg/network/payload/ping_test.go @@ -3,7 +3,7 @@ package payload import ( "testing" - "github.com/CityOfZion/neo-go/pkg/io" + "github.com/nspcc-dev/neo-go/pkg/io" "github.com/stretchr/testify/assert" ) diff --git a/pkg/network/payload/version.go b/pkg/network/payload/version.go index a6da82e02..3bb6bc345 100644 --- a/pkg/network/payload/version.go +++ b/pkg/network/payload/version.go @@ -3,7 +3,7 @@ package payload import ( "time" - "github.com/CityOfZion/neo-go/pkg/io" + "github.com/nspcc-dev/neo-go/pkg/io" ) // Size of the payload not counting UserAgent encoding (which is at least 1 byte diff --git a/pkg/network/payload/version_test.go b/pkg/network/payload/version_test.go index 4af2e2425..21fd497a0 100644 --- a/pkg/network/payload/version_test.go +++ b/pkg/network/payload/version_test.go @@ -3,7 +3,7 @@ package payload import ( "testing" - "github.com/CityOfZion/neo-go/pkg/io" + "github.com/nspcc-dev/neo-go/pkg/io" "github.com/stretchr/testify/assert" ) diff --git a/pkg/network/peer.go b/pkg/network/peer.go index 323127b4e..b40751251 100644 --- a/pkg/network/peer.go +++ b/pkg/network/peer.go @@ -3,7 +3,7 @@ package network import ( "net" - "github.com/CityOfZion/neo-go/pkg/network/payload" + "github.com/nspcc-dev/neo-go/pkg/network/payload" ) // Peer represents a network node neo-go is connected to. diff --git a/pkg/network/server.go b/pkg/network/server.go index 86600405d..efd6d5e3f 100644 --- a/pkg/network/server.go +++ b/pkg/network/server.go @@ -10,12 +10,12 @@ import ( "sync" "time" - "github.com/CityOfZion/neo-go/pkg/consensus" - "github.com/CityOfZion/neo-go/pkg/core" - "github.com/CityOfZion/neo-go/pkg/core/block" - "github.com/CityOfZion/neo-go/pkg/core/transaction" - "github.com/CityOfZion/neo-go/pkg/network/payload" - "github.com/CityOfZion/neo-go/pkg/util" + "github.com/nspcc-dev/neo-go/pkg/consensus" + "github.com/nspcc-dev/neo-go/pkg/core" + "github.com/nspcc-dev/neo-go/pkg/core/block" + "github.com/nspcc-dev/neo-go/pkg/core/transaction" + "github.com/nspcc-dev/neo-go/pkg/network/payload" + "github.com/nspcc-dev/neo-go/pkg/util" "go.uber.org/atomic" "go.uber.org/zap" ) diff --git a/pkg/network/server_config.go b/pkg/network/server_config.go index a383e30ec..42a2a1613 100644 --- a/pkg/network/server_config.go +++ b/pkg/network/server_config.go @@ -3,7 +3,7 @@ package network import ( "time" - "github.com/CityOfZion/neo-go/config" + "github.com/nspcc-dev/neo-go/config" "go.uber.org/zap/zapcore" ) diff --git a/pkg/network/server_test.go b/pkg/network/server_test.go index 99828f63b..5c68c4efd 100644 --- a/pkg/network/server_test.go +++ b/pkg/network/server_test.go @@ -4,7 +4,7 @@ import ( "net" "testing" - "github.com/CityOfZion/neo-go/pkg/network/payload" + "github.com/nspcc-dev/neo-go/pkg/network/payload" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/pkg/network/tcp_peer.go b/pkg/network/tcp_peer.go index 62fd33b4c..db1c13bc4 100644 --- a/pkg/network/tcp_peer.go +++ b/pkg/network/tcp_peer.go @@ -8,8 +8,8 @@ import ( "sync" "time" - "github.com/CityOfZion/neo-go/pkg/io" - "github.com/CityOfZion/neo-go/pkg/network/payload" + "github.com/nspcc-dev/neo-go/pkg/io" + "github.com/nspcc-dev/neo-go/pkg/network/payload" "go.uber.org/zap" ) diff --git a/pkg/network/tcp_peer_test.go b/pkg/network/tcp_peer_test.go index 5e2e6366d..210a2a331 100644 --- a/pkg/network/tcp_peer_test.go +++ b/pkg/network/tcp_peer_test.go @@ -4,7 +4,7 @@ import ( "net" "testing" - "github.com/CityOfZion/neo-go/pkg/network/payload" + "github.com/nspcc-dev/neo-go/pkg/network/payload" "github.com/stretchr/testify/require" ) diff --git a/pkg/rpc/client/client.go b/pkg/rpc/client/client.go index 8f9298e70..a18f42ef0 100644 --- a/pkg/rpc/client/client.go +++ b/pkg/rpc/client/client.go @@ -11,12 +11,12 @@ import ( "sync" "time" - "github.com/CityOfZion/neo-go/pkg/core/state" - "github.com/CityOfZion/neo-go/pkg/core/transaction" - "github.com/CityOfZion/neo-go/pkg/crypto/keys" - "github.com/CityOfZion/neo-go/pkg/rpc/request" - "github.com/CityOfZion/neo-go/pkg/rpc/response" - "github.com/CityOfZion/neo-go/pkg/util" + "github.com/nspcc-dev/neo-go/pkg/core/state" + "github.com/nspcc-dev/neo-go/pkg/core/transaction" + "github.com/nspcc-dev/neo-go/pkg/crypto/keys" + "github.com/nspcc-dev/neo-go/pkg/rpc/request" + "github.com/nspcc-dev/neo-go/pkg/rpc/response" + "github.com/nspcc-dev/neo-go/pkg/util" "github.com/pkg/errors" ) diff --git a/pkg/rpc/client/neoscan.go b/pkg/rpc/client/neoscan.go index 76d65bcfc..011eb9c67 100644 --- a/pkg/rpc/client/neoscan.go +++ b/pkg/rpc/client/neoscan.go @@ -6,10 +6,10 @@ import ( "net/http" "sort" - "github.com/CityOfZion/neo-go/pkg/core/state" - "github.com/CityOfZion/neo-go/pkg/core/transaction" - "github.com/CityOfZion/neo-go/pkg/rpc/response/result" - "github.com/CityOfZion/neo-go/pkg/util" + "github.com/nspcc-dev/neo-go/pkg/core/state" + "github.com/nspcc-dev/neo-go/pkg/core/transaction" + "github.com/nspcc-dev/neo-go/pkg/rpc/response/result" + "github.com/nspcc-dev/neo-go/pkg/util" errs "github.com/pkg/errors" ) diff --git a/pkg/rpc/client/rpc.go b/pkg/rpc/client/rpc.go index 0fdf06ab7..834868ac1 100644 --- a/pkg/rpc/client/rpc.go +++ b/pkg/rpc/client/rpc.go @@ -3,14 +3,14 @@ package client import ( "encoding/hex" - "github.com/CityOfZion/neo-go/pkg/core" - "github.com/CityOfZion/neo-go/pkg/core/transaction" - "github.com/CityOfZion/neo-go/pkg/crypto/keys" - "github.com/CityOfZion/neo-go/pkg/rpc/request" - "github.com/CityOfZion/neo-go/pkg/rpc/response/result" - "github.com/CityOfZion/neo-go/pkg/smartcontract" - "github.com/CityOfZion/neo-go/pkg/util" - "github.com/CityOfZion/neo-go/pkg/wallet" + "github.com/nspcc-dev/neo-go/pkg/core" + "github.com/nspcc-dev/neo-go/pkg/core/transaction" + "github.com/nspcc-dev/neo-go/pkg/crypto/keys" + "github.com/nspcc-dev/neo-go/pkg/rpc/request" + "github.com/nspcc-dev/neo-go/pkg/rpc/response/result" + "github.com/nspcc-dev/neo-go/pkg/smartcontract" + "github.com/nspcc-dev/neo-go/pkg/util" + "github.com/nspcc-dev/neo-go/pkg/wallet" "github.com/pkg/errors" ) diff --git a/pkg/rpc/request/param.go b/pkg/rpc/request/param.go index 77dbd38bd..66e054842 100644 --- a/pkg/rpc/request/param.go +++ b/pkg/rpc/request/param.go @@ -6,9 +6,9 @@ import ( "encoding/json" "fmt" - "github.com/CityOfZion/neo-go/pkg/encoding/address" - "github.com/CityOfZion/neo-go/pkg/smartcontract" - "github.com/CityOfZion/neo-go/pkg/util" + "github.com/nspcc-dev/neo-go/pkg/encoding/address" + "github.com/nspcc-dev/neo-go/pkg/smartcontract" + "github.com/nspcc-dev/neo-go/pkg/util" "github.com/pkg/errors" ) @@ -26,7 +26,7 @@ type ( // invokefunction RPC method. FuncParam struct { Type smartcontract.ParamType `json:"type"` - Value Param `json:"value"` + Value Param `json:"value"` } ) diff --git a/pkg/rpc/request/param_test.go b/pkg/rpc/request/param_test.go index deaf36290..26d29bab1 100644 --- a/pkg/rpc/request/param_test.go +++ b/pkg/rpc/request/param_test.go @@ -5,9 +5,9 @@ import ( "encoding/json" "testing" - "github.com/CityOfZion/neo-go/pkg/encoding/address" - "github.com/CityOfZion/neo-go/pkg/smartcontract" - "github.com/CityOfZion/neo-go/pkg/util" + "github.com/nspcc-dev/neo-go/pkg/encoding/address" + "github.com/nspcc-dev/neo-go/pkg/smartcontract" + "github.com/nspcc-dev/neo-go/pkg/util" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/pkg/rpc/request/scdetails.go b/pkg/rpc/request/scdetails.go index f52302683..c53e21e61 100644 --- a/pkg/rpc/request/scdetails.go +++ b/pkg/rpc/request/scdetails.go @@ -1,6 +1,6 @@ package request -import "github.com/CityOfZion/neo-go/pkg/smartcontract" +import "github.com/nspcc-dev/neo-go/pkg/smartcontract" // ContractDetails contains contract metadata. type ContractDetails struct { diff --git a/pkg/rpc/request/txBuilder.go b/pkg/rpc/request/txBuilder.go index e7aa6c376..8fe3df81c 100644 --- a/pkg/rpc/request/txBuilder.go +++ b/pkg/rpc/request/txBuilder.go @@ -5,15 +5,15 @@ import ( "fmt" "strconv" - "github.com/CityOfZion/neo-go/pkg/core/transaction" - "github.com/CityOfZion/neo-go/pkg/crypto/keys" - "github.com/CityOfZion/neo-go/pkg/encoding/address" - "github.com/CityOfZion/neo-go/pkg/io" - "github.com/CityOfZion/neo-go/pkg/smartcontract" - "github.com/CityOfZion/neo-go/pkg/util" - "github.com/CityOfZion/neo-go/pkg/vm/emit" - "github.com/CityOfZion/neo-go/pkg/vm/opcode" - "github.com/CityOfZion/neo-go/pkg/wallet" + "github.com/nspcc-dev/neo-go/pkg/core/transaction" + "github.com/nspcc-dev/neo-go/pkg/crypto/keys" + "github.com/nspcc-dev/neo-go/pkg/encoding/address" + "github.com/nspcc-dev/neo-go/pkg/io" + "github.com/nspcc-dev/neo-go/pkg/smartcontract" + "github.com/nspcc-dev/neo-go/pkg/util" + "github.com/nspcc-dev/neo-go/pkg/vm/emit" + "github.com/nspcc-dev/neo-go/pkg/vm/opcode" + "github.com/nspcc-dev/neo-go/pkg/wallet" errs "github.com/pkg/errors" ) diff --git a/pkg/rpc/request/txTypes.go b/pkg/rpc/request/txTypes.go index 0201e63e1..aebf8055f 100644 --- a/pkg/rpc/request/txTypes.go +++ b/pkg/rpc/request/txTypes.go @@ -6,9 +6,9 @@ package request */ import ( - "github.com/CityOfZion/neo-go/pkg/core/transaction" - "github.com/CityOfZion/neo-go/pkg/crypto/keys" - "github.com/CityOfZion/neo-go/pkg/util" + "github.com/nspcc-dev/neo-go/pkg/core/transaction" + "github.com/nspcc-dev/neo-go/pkg/crypto/keys" + "github.com/nspcc-dev/neo-go/pkg/util" ) type ( diff --git a/pkg/rpc/request/tx_builder_test.go b/pkg/rpc/request/tx_builder_test.go index 8b5254e17..ef9dcb326 100644 --- a/pkg/rpc/request/tx_builder_test.go +++ b/pkg/rpc/request/tx_builder_test.go @@ -4,8 +4,8 @@ import ( "encoding/hex" "testing" - "github.com/CityOfZion/neo-go/pkg/smartcontract" - "github.com/CityOfZion/neo-go/pkg/util" + "github.com/nspcc-dev/neo-go/pkg/smartcontract" + "github.com/nspcc-dev/neo-go/pkg/util" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/pkg/rpc/response/result/account_state.go b/pkg/rpc/response/result/account_state.go index df1dad2b9..5eeb6c1ba 100644 --- a/pkg/rpc/response/result/account_state.go +++ b/pkg/rpc/response/result/account_state.go @@ -4,9 +4,9 @@ import ( "bytes" "sort" - "github.com/CityOfZion/neo-go/pkg/core/state" - "github.com/CityOfZion/neo-go/pkg/crypto/keys" - "github.com/CityOfZion/neo-go/pkg/util" + "github.com/nspcc-dev/neo-go/pkg/core/state" + "github.com/nspcc-dev/neo-go/pkg/crypto/keys" + "github.com/nspcc-dev/neo-go/pkg/util" ) // AccountState wrapper used for the representation of diff --git a/pkg/rpc/response/result/application_log.go b/pkg/rpc/response/result/application_log.go index 9e4f7fcc8..83275b9bd 100644 --- a/pkg/rpc/response/result/application_log.go +++ b/pkg/rpc/response/result/application_log.go @@ -3,10 +3,10 @@ package result import ( "encoding/json" - "github.com/CityOfZion/neo-go/pkg/core/state" - "github.com/CityOfZion/neo-go/pkg/smartcontract" - "github.com/CityOfZion/neo-go/pkg/util" - "github.com/CityOfZion/neo-go/pkg/vm" + "github.com/nspcc-dev/neo-go/pkg/core/state" + "github.com/nspcc-dev/neo-go/pkg/smartcontract" + "github.com/nspcc-dev/neo-go/pkg/util" + "github.com/nspcc-dev/neo-go/pkg/vm" ) // ApplicationLog wrapper used for the representation of the diff --git a/pkg/rpc/response/result/asset_state.go b/pkg/rpc/response/result/asset_state.go index ffedbb6bb..8d7ffe137 100644 --- a/pkg/rpc/response/result/asset_state.go +++ b/pkg/rpc/response/result/asset_state.go @@ -1,10 +1,10 @@ package result import ( - "github.com/CityOfZion/neo-go/pkg/core/state" - "github.com/CityOfZion/neo-go/pkg/core/transaction" - "github.com/CityOfZion/neo-go/pkg/encoding/address" - "github.com/CityOfZion/neo-go/pkg/util" + "github.com/nspcc-dev/neo-go/pkg/core/state" + "github.com/nspcc-dev/neo-go/pkg/core/transaction" + "github.com/nspcc-dev/neo-go/pkg/encoding/address" + "github.com/nspcc-dev/neo-go/pkg/util" ) // AssetState wrapper used for the representation of diff --git a/pkg/rpc/response/result/block.go b/pkg/rpc/response/result/block.go index aa8a20377..440161490 100644 --- a/pkg/rpc/response/result/block.go +++ b/pkg/rpc/response/result/block.go @@ -3,11 +3,11 @@ package result import ( "strconv" - "github.com/CityOfZion/neo-go/pkg/core" - "github.com/CityOfZion/neo-go/pkg/core/block" - "github.com/CityOfZion/neo-go/pkg/core/transaction" - "github.com/CityOfZion/neo-go/pkg/io" - "github.com/CityOfZion/neo-go/pkg/util" + "github.com/nspcc-dev/neo-go/pkg/core" + "github.com/nspcc-dev/neo-go/pkg/core/block" + "github.com/nspcc-dev/neo-go/pkg/core/transaction" + "github.com/nspcc-dev/neo-go/pkg/io" + "github.com/nspcc-dev/neo-go/pkg/util" ) type ( diff --git a/pkg/rpc/response/result/claimable.go b/pkg/rpc/response/result/claimable.go index d537a5891..71dbc60b8 100644 --- a/pkg/rpc/response/result/claimable.go +++ b/pkg/rpc/response/result/claimable.go @@ -1,6 +1,6 @@ package result -import "github.com/CityOfZion/neo-go/pkg/util" +import "github.com/nspcc-dev/neo-go/pkg/util" // ClaimableInfo is a result of a getclaimable RPC call. type ClaimableInfo struct { diff --git a/pkg/rpc/response/result/contract_state.go b/pkg/rpc/response/result/contract_state.go index 08e8a277a..55a75e201 100644 --- a/pkg/rpc/response/result/contract_state.go +++ b/pkg/rpc/response/result/contract_state.go @@ -1,9 +1,9 @@ package result import ( - "github.com/CityOfZion/neo-go/pkg/core/state" - "github.com/CityOfZion/neo-go/pkg/smartcontract" - "github.com/CityOfZion/neo-go/pkg/util" + "github.com/nspcc-dev/neo-go/pkg/core/state" + "github.com/nspcc-dev/neo-go/pkg/smartcontract" + "github.com/nspcc-dev/neo-go/pkg/util" ) // ContractState wrapper used for the representation of diff --git a/pkg/rpc/response/result/invoke.go b/pkg/rpc/response/result/invoke.go index 171fd1b65..d249d06fb 100644 --- a/pkg/rpc/response/result/invoke.go +++ b/pkg/rpc/response/result/invoke.go @@ -1,7 +1,7 @@ package result import ( - "github.com/CityOfZion/neo-go/pkg/smartcontract" + "github.com/nspcc-dev/neo-go/pkg/smartcontract" ) // Invoke represents code invocation result and is used by several RPC calls diff --git a/pkg/rpc/response/result/tx_output.go b/pkg/rpc/response/result/tx_output.go index 19a6fc66b..4078de755 100644 --- a/pkg/rpc/response/result/tx_output.go +++ b/pkg/rpc/response/result/tx_output.go @@ -1,9 +1,9 @@ package result import ( - "github.com/CityOfZion/neo-go/pkg/core/transaction" - "github.com/CityOfZion/neo-go/pkg/encoding/address" - "github.com/CityOfZion/neo-go/pkg/util" + "github.com/nspcc-dev/neo-go/pkg/core/transaction" + "github.com/nspcc-dev/neo-go/pkg/encoding/address" + "github.com/nspcc-dev/neo-go/pkg/util" ) // TransactionOutput is a wrapper to represent transaction's output. diff --git a/pkg/rpc/response/result/tx_raw_output.go b/pkg/rpc/response/result/tx_raw_output.go index 512514471..288311422 100644 --- a/pkg/rpc/response/result/tx_raw_output.go +++ b/pkg/rpc/response/result/tx_raw_output.go @@ -1,11 +1,11 @@ package result import ( - "github.com/CityOfZion/neo-go/pkg/core" - "github.com/CityOfZion/neo-go/pkg/core/block" - "github.com/CityOfZion/neo-go/pkg/core/transaction" - "github.com/CityOfZion/neo-go/pkg/io" - "github.com/CityOfZion/neo-go/pkg/util" + "github.com/nspcc-dev/neo-go/pkg/core" + "github.com/nspcc-dev/neo-go/pkg/core/block" + "github.com/nspcc-dev/neo-go/pkg/core/transaction" + "github.com/nspcc-dev/neo-go/pkg/io" + "github.com/nspcc-dev/neo-go/pkg/util" ) // TransactionOutputRaw is used as a wrapper to represents diff --git a/pkg/rpc/response/result/unspents.go b/pkg/rpc/response/result/unspents.go index d903f8a30..623d2e1a5 100644 --- a/pkg/rpc/response/result/unspents.go +++ b/pkg/rpc/response/result/unspents.go @@ -1,9 +1,9 @@ package result import ( - "github.com/CityOfZion/neo-go/pkg/core" - "github.com/CityOfZion/neo-go/pkg/core/state" - "github.com/CityOfZion/neo-go/pkg/util" + "github.com/nspcc-dev/neo-go/pkg/core" + "github.com/nspcc-dev/neo-go/pkg/core/state" + "github.com/nspcc-dev/neo-go/pkg/util" ) // UnspentBalanceInfo wrapper is used to represent single unspent asset entry diff --git a/pkg/rpc/response/types.go b/pkg/rpc/response/types.go index 7c53040fc..0b236826a 100644 --- a/pkg/rpc/response/types.go +++ b/pkg/rpc/response/types.go @@ -3,7 +3,7 @@ package response import ( "encoding/json" - "github.com/CityOfZion/neo-go/pkg/rpc/response/result" + "github.com/nspcc-dev/neo-go/pkg/rpc/response/result" ) // Header is a generic JSON-RPC 2.0 response header (ID and JSON-RPC version). diff --git a/pkg/rpc/server/server.go b/pkg/rpc/server/server.go index 9b5967554..5a47cd7c6 100644 --- a/pkg/rpc/server/server.go +++ b/pkg/rpc/server/server.go @@ -8,18 +8,18 @@ import ( "net/http" "strconv" - "github.com/CityOfZion/neo-go/config" - "github.com/CityOfZion/neo-go/pkg/core" - "github.com/CityOfZion/neo-go/pkg/core/state" - "github.com/CityOfZion/neo-go/pkg/core/transaction" - "github.com/CityOfZion/neo-go/pkg/crypto/hash" - "github.com/CityOfZion/neo-go/pkg/encoding/address" - "github.com/CityOfZion/neo-go/pkg/io" - "github.com/CityOfZion/neo-go/pkg/network" - "github.com/CityOfZion/neo-go/pkg/rpc/request" - "github.com/CityOfZion/neo-go/pkg/rpc/response" - "github.com/CityOfZion/neo-go/pkg/rpc/response/result" - "github.com/CityOfZion/neo-go/pkg/util" + "github.com/nspcc-dev/neo-go/config" + "github.com/nspcc-dev/neo-go/pkg/core" + "github.com/nspcc-dev/neo-go/pkg/core/state" + "github.com/nspcc-dev/neo-go/pkg/core/transaction" + "github.com/nspcc-dev/neo-go/pkg/crypto/hash" + "github.com/nspcc-dev/neo-go/pkg/encoding/address" + "github.com/nspcc-dev/neo-go/pkg/io" + "github.com/nspcc-dev/neo-go/pkg/network" + "github.com/nspcc-dev/neo-go/pkg/rpc/request" + "github.com/nspcc-dev/neo-go/pkg/rpc/response" + "github.com/nspcc-dev/neo-go/pkg/rpc/response/result" + "github.com/nspcc-dev/neo-go/pkg/util" "github.com/pkg/errors" "go.uber.org/zap" ) diff --git a/pkg/rpc/server/server_helper_test.go b/pkg/rpc/server/server_helper_test.go index 6bfeaba4c..85f464dda 100644 --- a/pkg/rpc/server/server_helper_test.go +++ b/pkg/rpc/server/server_helper_test.go @@ -5,14 +5,14 @@ import ( "os" "testing" - "github.com/CityOfZion/neo-go/config" - "github.com/CityOfZion/neo-go/pkg/core" - "github.com/CityOfZion/neo-go/pkg/core/block" - "github.com/CityOfZion/neo-go/pkg/core/storage" - "github.com/CityOfZion/neo-go/pkg/core/transaction" - "github.com/CityOfZion/neo-go/pkg/io" - "github.com/CityOfZion/neo-go/pkg/network" - "github.com/CityOfZion/neo-go/pkg/util" + "github.com/nspcc-dev/neo-go/config" + "github.com/nspcc-dev/neo-go/pkg/core" + "github.com/nspcc-dev/neo-go/pkg/core/block" + "github.com/nspcc-dev/neo-go/pkg/core/storage" + "github.com/nspcc-dev/neo-go/pkg/core/transaction" + "github.com/nspcc-dev/neo-go/pkg/io" + "github.com/nspcc-dev/neo-go/pkg/network" + "github.com/nspcc-dev/neo-go/pkg/util" "github.com/stretchr/testify/require" "go.uber.org/zap/zaptest" ) diff --git a/pkg/rpc/server/server_test.go b/pkg/rpc/server/server_test.go index 52f0ea008..05a93da14 100644 --- a/pkg/rpc/server/server_test.go +++ b/pkg/rpc/server/server_test.go @@ -12,12 +12,12 @@ import ( "strings" "testing" - "github.com/CityOfZion/neo-go/pkg/core" - "github.com/CityOfZion/neo-go/pkg/core/transaction" - "github.com/CityOfZion/neo-go/pkg/internal/random" - "github.com/CityOfZion/neo-go/pkg/rpc/response" - "github.com/CityOfZion/neo-go/pkg/rpc/response/result" - "github.com/CityOfZion/neo-go/pkg/util" + "github.com/nspcc-dev/neo-go/pkg/core" + "github.com/nspcc-dev/neo-go/pkg/core/transaction" + "github.com/nspcc-dev/neo-go/pkg/internal/random" + "github.com/nspcc-dev/neo-go/pkg/rpc/response" + "github.com/nspcc-dev/neo-go/pkg/rpc/response/result" + "github.com/nspcc-dev/neo-go/pkg/util" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/pkg/rpc/server/testdata/test_contract.go b/pkg/rpc/server/testdata/test_contract.go index f1ee83997..33b4d5bd3 100644 --- a/pkg/rpc/server/testdata/test_contract.go +++ b/pkg/rpc/server/testdata/test_contract.go @@ -1,6 +1,6 @@ package testdata -import "github.com/CityOfZion/neo-go/pkg/interop/storage" +import "github.com/nspcc-dev/neo-go/pkg/interop/storage" func Main(operation string, args []interface{}) interface{} { ctx := storage.GetContext() diff --git a/pkg/smartcontract/contract.go b/pkg/smartcontract/contract.go index 297c0362a..d021637e5 100644 --- a/pkg/smartcontract/contract.go +++ b/pkg/smartcontract/contract.go @@ -4,10 +4,10 @@ import ( "fmt" "sort" - "github.com/CityOfZion/neo-go/pkg/crypto/keys" - "github.com/CityOfZion/neo-go/pkg/io" - "github.com/CityOfZion/neo-go/pkg/vm/emit" - "github.com/CityOfZion/neo-go/pkg/vm/opcode" + "github.com/nspcc-dev/neo-go/pkg/crypto/keys" + "github.com/nspcc-dev/neo-go/pkg/io" + "github.com/nspcc-dev/neo-go/pkg/vm/emit" + "github.com/nspcc-dev/neo-go/pkg/vm/opcode" ) // CreateMultiSigRedeemScript creates a script runnable by the VM. diff --git a/pkg/smartcontract/contract_test.go b/pkg/smartcontract/contract_test.go index dbebbdab2..f07683fe5 100644 --- a/pkg/smartcontract/contract_test.go +++ b/pkg/smartcontract/contract_test.go @@ -3,9 +3,9 @@ package smartcontract import ( "testing" - "github.com/CityOfZion/neo-go/pkg/crypto/keys" - "github.com/CityOfZion/neo-go/pkg/io" - "github.com/CityOfZion/neo-go/pkg/vm/opcode" + "github.com/nspcc-dev/neo-go/pkg/crypto/keys" + "github.com/nspcc-dev/neo-go/pkg/io" + "github.com/nspcc-dev/neo-go/pkg/vm/opcode" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/pkg/smartcontract/param_context.go b/pkg/smartcontract/param_context.go index ed5e9c887..147e00c9f 100644 --- a/pkg/smartcontract/param_context.go +++ b/pkg/smartcontract/param_context.go @@ -9,7 +9,7 @@ import ( "strings" "unicode/utf8" - "github.com/CityOfZion/neo-go/pkg/util" + "github.com/nspcc-dev/neo-go/pkg/util" "github.com/pkg/errors" ) @@ -60,7 +60,7 @@ type rawKeyValuePair struct { func (p *Parameter) MarshalJSON() ([]byte, error) { var ( resultRawValue json.RawMessage - resultErr error + resultErr error ) switch p.Type { case BoolType, IntegerType, StringType, Hash256Type, Hash160Type: @@ -369,4 +369,4 @@ func NewParameterFromString(in string) (*Parameter, error) { return nil, err } return res, nil -} \ No newline at end of file +} diff --git a/pkg/smartcontract/param_context_test.go b/pkg/smartcontract/param_context_test.go index 1a188a4be..b6870e8eb 100644 --- a/pkg/smartcontract/param_context_test.go +++ b/pkg/smartcontract/param_context_test.go @@ -6,7 +6,7 @@ import ( "reflect" "testing" - "github.com/CityOfZion/neo-go/pkg/util" + "github.com/nspcc-dev/neo-go/pkg/util" "github.com/stretchr/testify/assert" ) diff --git a/pkg/smartcontract/param_type.go b/pkg/smartcontract/param_type.go index 0c98125fd..ed00bb112 100644 --- a/pkg/smartcontract/param_type.go +++ b/pkg/smartcontract/param_type.go @@ -6,9 +6,9 @@ import ( "strconv" "strings" - "github.com/CityOfZion/neo-go/pkg/crypto/keys" - "github.com/CityOfZion/neo-go/pkg/encoding/address" - "github.com/CityOfZion/neo-go/pkg/io" + "github.com/nspcc-dev/neo-go/pkg/crypto/keys" + "github.com/nspcc-dev/neo-go/pkg/encoding/address" + "github.com/nspcc-dev/neo-go/pkg/io" "github.com/pkg/errors" ) diff --git a/pkg/util/fixed8.go b/pkg/util/fixed8.go index 1282da8b8..6604f0f38 100644 --- a/pkg/util/fixed8.go +++ b/pkg/util/fixed8.go @@ -6,7 +6,7 @@ import ( "strconv" "strings" - "github.com/CityOfZion/neo-go/pkg/io" + "github.com/nspcc-dev/neo-go/pkg/io" ) const ( diff --git a/pkg/util/fixed8_test.go b/pkg/util/fixed8_test.go index 7b2c76463..893cc86dc 100644 --- a/pkg/util/fixed8_test.go +++ b/pkg/util/fixed8_test.go @@ -5,8 +5,8 @@ import ( "strconv" "testing" - "github.com/CityOfZion/neo-go/pkg/io" "github.com/go-yaml/yaml" + "github.com/nspcc-dev/neo-go/pkg/io" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/pkg/util/uint256.go b/pkg/util/uint256.go index b8b5588bf..9e3c0df2f 100644 --- a/pkg/util/uint256.go +++ b/pkg/util/uint256.go @@ -7,7 +7,7 @@ import ( "fmt" "strings" - "github.com/CityOfZion/neo-go/pkg/io" + "github.com/nspcc-dev/neo-go/pkg/io" ) // Uint256Size is the size of Uint256 in bytes. diff --git a/pkg/util/uint256_test.go b/pkg/util/uint256_test.go index 9fc8bf1c0..4f12fd658 100644 --- a/pkg/util/uint256_test.go +++ b/pkg/util/uint256_test.go @@ -4,7 +4,7 @@ import ( "encoding/hex" "testing" - "github.com/CityOfZion/neo-go/pkg/io" + "github.com/nspcc-dev/neo-go/pkg/io" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/pkg/vm/cli/cli.go b/pkg/vm/cli/cli.go index 3054df427..0eec6dbff 100644 --- a/pkg/vm/cli/cli.go +++ b/pkg/vm/cli/cli.go @@ -10,8 +10,8 @@ import ( "strconv" "strings" - "github.com/CityOfZion/neo-go/pkg/compiler" - "github.com/CityOfZion/neo-go/pkg/vm" + "github.com/nspcc-dev/neo-go/pkg/compiler" + "github.com/nspcc-dev/neo-go/pkg/vm" "gopkg.in/abiosoft/ishell.v2" ) diff --git a/pkg/vm/context.go b/pkg/vm/context.go index cb540cea2..43ea9c6ae 100644 --- a/pkg/vm/context.go +++ b/pkg/vm/context.go @@ -4,10 +4,10 @@ import ( "encoding/binary" "errors" - "github.com/CityOfZion/neo-go/pkg/crypto/hash" - "github.com/CityOfZion/neo-go/pkg/smartcontract" - "github.com/CityOfZion/neo-go/pkg/util" - "github.com/CityOfZion/neo-go/pkg/vm/opcode" + "github.com/nspcc-dev/neo-go/pkg/crypto/hash" + "github.com/nspcc-dev/neo-go/pkg/smartcontract" + "github.com/nspcc-dev/neo-go/pkg/util" + "github.com/nspcc-dev/neo-go/pkg/vm/opcode" ) // Context represents the current execution context of the VM. diff --git a/pkg/vm/contract_checks.go b/pkg/vm/contract_checks.go index 375c3ceec..ecb9dfb31 100644 --- a/pkg/vm/contract_checks.go +++ b/pkg/vm/contract_checks.go @@ -3,7 +3,7 @@ package vm import ( "encoding/binary" - "github.com/CityOfZion/neo-go/pkg/vm/opcode" + "github.com/nspcc-dev/neo-go/pkg/vm/opcode" ) func getNumOfThingsFromInstr(instr opcode.Opcode, param []byte) (int, bool) { diff --git a/pkg/vm/contract_checks_test.go b/pkg/vm/contract_checks_test.go index bafeaff67..fc2dcae85 100644 --- a/pkg/vm/contract_checks_test.go +++ b/pkg/vm/contract_checks_test.go @@ -3,7 +3,7 @@ package vm import ( "testing" - "github.com/CityOfZion/neo-go/pkg/vm/opcode" + "github.com/nspcc-dev/neo-go/pkg/vm/opcode" "github.com/stretchr/testify/assert" ) diff --git a/pkg/vm/emit/bigint_test.go b/pkg/vm/emit/bigint_test.go index 542c4050b..2195ac3dc 100644 --- a/pkg/vm/emit/bigint_test.go +++ b/pkg/vm/emit/bigint_test.go @@ -5,7 +5,7 @@ import ( "math/big" "testing" - "github.com/CityOfZion/neo-go/pkg/util" + "github.com/nspcc-dev/neo-go/pkg/util" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/pkg/vm/emit/emit.go b/pkg/vm/emit/emit.go index 5bba67a9b..60ace95c8 100644 --- a/pkg/vm/emit/emit.go +++ b/pkg/vm/emit/emit.go @@ -6,9 +6,9 @@ import ( "fmt" "math/big" - "github.com/CityOfZion/neo-go/pkg/io" - "github.com/CityOfZion/neo-go/pkg/util" - "github.com/CityOfZion/neo-go/pkg/vm/opcode" + "github.com/nspcc-dev/neo-go/pkg/io" + "github.com/nspcc-dev/neo-go/pkg/util" + "github.com/nspcc-dev/neo-go/pkg/vm/opcode" ) // Instruction emits a VM Instruction with data to the given buffer. diff --git a/pkg/vm/emit/emit_test.go b/pkg/vm/emit/emit_test.go index ed6c94cd5..8dd3e525b 100644 --- a/pkg/vm/emit/emit_test.go +++ b/pkg/vm/emit/emit_test.go @@ -5,8 +5,8 @@ import ( "errors" "testing" - "github.com/CityOfZion/neo-go/pkg/io" - "github.com/CityOfZion/neo-go/pkg/vm/opcode" + "github.com/nspcc-dev/neo-go/pkg/io" + "github.com/nspcc-dev/neo-go/pkg/vm/opcode" "github.com/stretchr/testify/assert" ) diff --git a/pkg/vm/json_test.go b/pkg/vm/json_test.go index c8ba85e35..a92a103a7 100644 --- a/pkg/vm/json_test.go +++ b/pkg/vm/json_test.go @@ -13,11 +13,10 @@ import ( "strings" "testing" - "github.com/CityOfZion/neo-go/pkg/vm/emit" - - "github.com/CityOfZion/neo-go/pkg/crypto/hash" - "github.com/CityOfZion/neo-go/pkg/util" - "github.com/CityOfZion/neo-go/pkg/vm/opcode" + "github.com/nspcc-dev/neo-go/pkg/crypto/hash" + "github.com/nspcc-dev/neo-go/pkg/util" + "github.com/nspcc-dev/neo-go/pkg/vm/emit" + "github.com/nspcc-dev/neo-go/pkg/vm/opcode" "github.com/stretchr/testify/require" ) diff --git a/pkg/vm/serialization.go b/pkg/vm/serialization.go index 194348968..fd01cc14e 100644 --- a/pkg/vm/serialization.go +++ b/pkg/vm/serialization.go @@ -3,9 +3,8 @@ package vm import ( "errors" - "github.com/CityOfZion/neo-go/pkg/vm/emit" - - "github.com/CityOfZion/neo-go/pkg/io" + "github.com/nspcc-dev/neo-go/pkg/io" + "github.com/nspcc-dev/neo-go/pkg/vm/emit" ) type stackItemType byte diff --git a/pkg/vm/stack.go b/pkg/vm/stack.go index bc3142363..b9b417212 100644 --- a/pkg/vm/stack.go +++ b/pkg/vm/stack.go @@ -6,8 +6,8 @@ import ( "fmt" "math/big" - "github.com/CityOfZion/neo-go/pkg/smartcontract" - "github.com/CityOfZion/neo-go/pkg/vm/emit" + "github.com/nspcc-dev/neo-go/pkg/smartcontract" + "github.com/nspcc-dev/neo-go/pkg/vm/emit" ) // Stack implementation for the neo-go virtual machine. The stack implements diff --git a/pkg/vm/stack_item.go b/pkg/vm/stack_item.go index d7184abdf..9ab19f835 100644 --- a/pkg/vm/stack_item.go +++ b/pkg/vm/stack_item.go @@ -8,8 +8,8 @@ import ( "math/big" "reflect" - "github.com/CityOfZion/neo-go/pkg/smartcontract" - "github.com/CityOfZion/neo-go/pkg/vm/emit" + "github.com/nspcc-dev/neo-go/pkg/smartcontract" + "github.com/nspcc-dev/neo-go/pkg/vm/emit" ) // A StackItem represents the "real" value that is pushed on the stack. diff --git a/pkg/vm/stack_item_test.go b/pkg/vm/stack_item_test.go index 24ca5f2f9..5725b9aad 100644 --- a/pkg/vm/stack_item_test.go +++ b/pkg/vm/stack_item_test.go @@ -3,9 +3,8 @@ package vm import ( "testing" + "github.com/nspcc-dev/neo-go/pkg/smartcontract" "github.com/stretchr/testify/assert" - - "github.com/CityOfZion/neo-go/pkg/smartcontract" ) var toContractParameterTestCases = []struct { diff --git a/pkg/vm/vm.go b/pkg/vm/vm.go index e5300377b..4ec5b603f 100644 --- a/pkg/vm/vm.go +++ b/pkg/vm/vm.go @@ -12,10 +12,10 @@ import ( "text/tabwriter" "unicode/utf8" - "github.com/CityOfZion/neo-go/pkg/crypto/hash" - "github.com/CityOfZion/neo-go/pkg/crypto/keys" - "github.com/CityOfZion/neo-go/pkg/util" - "github.com/CityOfZion/neo-go/pkg/vm/opcode" + "github.com/nspcc-dev/neo-go/pkg/crypto/hash" + "github.com/nspcc-dev/neo-go/pkg/crypto/keys" + "github.com/nspcc-dev/neo-go/pkg/util" + "github.com/nspcc-dev/neo-go/pkg/vm/opcode" "github.com/pkg/errors" ) diff --git a/pkg/vm/vm_test.go b/pkg/vm/vm_test.go index 7b4b9e225..c8488d189 100644 --- a/pkg/vm/vm_test.go +++ b/pkg/vm/vm_test.go @@ -8,13 +8,12 @@ import ( "math/rand" "testing" - "github.com/CityOfZion/neo-go/pkg/io" - - "github.com/CityOfZion/neo-go/pkg/crypto/hash" - "github.com/CityOfZion/neo-go/pkg/crypto/keys" - "github.com/CityOfZion/neo-go/pkg/util" - "github.com/CityOfZion/neo-go/pkg/vm/emit" - "github.com/CityOfZion/neo-go/pkg/vm/opcode" + "github.com/nspcc-dev/neo-go/pkg/crypto/hash" + "github.com/nspcc-dev/neo-go/pkg/crypto/keys" + "github.com/nspcc-dev/neo-go/pkg/io" + "github.com/nspcc-dev/neo-go/pkg/util" + "github.com/nspcc-dev/neo-go/pkg/vm/emit" + "github.com/nspcc-dev/neo-go/pkg/vm/opcode" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/pkg/wallet/account.go b/pkg/wallet/account.go index 68a44363b..46e016c23 100644 --- a/pkg/wallet/account.go +++ b/pkg/wallet/account.go @@ -7,13 +7,13 @@ import ( "errors" "fmt" - "github.com/CityOfZion/neo-go/pkg/core/transaction" - "github.com/CityOfZion/neo-go/pkg/crypto/hash" - "github.com/CityOfZion/neo-go/pkg/crypto/keys" - "github.com/CityOfZion/neo-go/pkg/encoding/address" - "github.com/CityOfZion/neo-go/pkg/smartcontract" - "github.com/CityOfZion/neo-go/pkg/util" - "github.com/CityOfZion/neo-go/pkg/vm/opcode" + "github.com/nspcc-dev/neo-go/pkg/core/transaction" + "github.com/nspcc-dev/neo-go/pkg/crypto/hash" + "github.com/nspcc-dev/neo-go/pkg/crypto/keys" + "github.com/nspcc-dev/neo-go/pkg/encoding/address" + "github.com/nspcc-dev/neo-go/pkg/smartcontract" + "github.com/nspcc-dev/neo-go/pkg/util" + "github.com/nspcc-dev/neo-go/pkg/vm/opcode" ) // Account represents a NEO account. It holds the private and public key diff --git a/pkg/wallet/account_test.go b/pkg/wallet/account_test.go index 1a8e0330a..365c28f8d 100644 --- a/pkg/wallet/account_test.go +++ b/pkg/wallet/account_test.go @@ -5,9 +5,9 @@ import ( "encoding/json" "testing" - "github.com/CityOfZion/neo-go/pkg/crypto/hash" - "github.com/CityOfZion/neo-go/pkg/crypto/keys" - "github.com/CityOfZion/neo-go/pkg/internal/keytestcases" + "github.com/nspcc-dev/neo-go/pkg/crypto/hash" + "github.com/nspcc-dev/neo-go/pkg/crypto/keys" + "github.com/nspcc-dev/neo-go/pkg/internal/keytestcases" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/pkg/wallet/wallet.go b/pkg/wallet/wallet.go index 8a6826f5b..e01c22eba 100644 --- a/pkg/wallet/wallet.go +++ b/pkg/wallet/wallet.go @@ -5,9 +5,9 @@ import ( "io" "os" - "github.com/CityOfZion/neo-go/pkg/crypto/keys" - "github.com/CityOfZion/neo-go/pkg/util" - "github.com/CityOfZion/neo-go/pkg/vm" + "github.com/nspcc-dev/neo-go/pkg/crypto/keys" + "github.com/nspcc-dev/neo-go/pkg/util" + "github.com/nspcc-dev/neo-go/pkg/vm" ) const ( diff --git a/pkg/wallet/wallet_test.go b/pkg/wallet/wallet_test.go index eee01b199..73e417ec3 100644 --- a/pkg/wallet/wallet_test.go +++ b/pkg/wallet/wallet_test.go @@ -6,7 +6,7 @@ import ( "os" "testing" - "github.com/CityOfZion/neo-go/pkg/encoding/address" + "github.com/nspcc-dev/neo-go/pkg/encoding/address" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" )