Skip to content

Commit

Permalink
Bump version of golang.org/x/tools
Browse files Browse the repository at this point in the history 
This addresses errors from x/tools/go/packages that surface when using
newer versions of go.

internal error: nil Pkg importing "sync" from "github.com/hyperledger/fabric/vendor/github.com/go-kit/kit/metrics/internal/ratemap"
internal error: nil Pkg importing "sync" from "github.com/hyperledger/fabric/vendor/github.com/go-kit/kit/metrics/internal/ratemap"
internal error: nil Pkg importing "math" from "github.com/hyperledger/fabric/vendor/github.com/onsi/gomega/matchers/support/goraph/util"
internal error: nil Pkg importing "math" from "github.com/hyperledger/fabric/vendor/github.com/onsi/gomega/matchers/support/goraph/util"

Bumping the x/tools package also bumps the goimports version, so this commit also addresses all of the goimports errors. It
also requires a proto rebuild to address formatting issues with the latest gofmt.

Signed-off-by: Brett Logan <[email protected]>
  • Loading branch information
Brett Logan committed Nov 17, 2020
1 parent e876e64 commit 2dbf8d6
Show file tree
Hide file tree
Showing 115 changed files with 17,443 additions and 12,697 deletions.
16 changes: 10 additions & 6 deletions Gopkg.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Gopkg.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ noverify = [

[[constraint]]
name = "golang.org/x/tools"
revision = "f60e5f99f0816fc2d9ecb338008ea420248d2943"
branch = "release-branch.go1.14"

[[constraint]]
name = "google.golang.org/grpc"
Expand Down
2 changes: 1 addition & 1 deletion cmd/discover/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (

"github.com/hyperledger/fabric/bccsp/factory"
"github.com/hyperledger/fabric/cmd/common"
"github.com/hyperledger/fabric/discovery/cmd"
discovery "github.com/hyperledger/fabric/discovery/cmd"
)

func main() {
Expand Down
2 changes: 1 addition & 1 deletion core/aclmgmt/resourceprovider_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (

"github.com/golang/protobuf/proto"
"github.com/hyperledger/fabric/common/localmsp"
"github.com/hyperledger/fabric/msp/mgmt/testtools"
msptesttools "github.com/hyperledger/fabric/msp/mgmt/testtools"
"github.com/hyperledger/fabric/protos/common"
"github.com/hyperledger/fabric/protos/peer"
"github.com/hyperledger/fabric/protos/utils"
Expand Down
2 changes: 1 addition & 1 deletion core/cclifecycle/util_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (

"github.com/golang/protobuf/proto"
"github.com/hyperledger/fabric/common/chaincode"
"github.com/hyperledger/fabric/core/cclifecycle"
cc "github.com/hyperledger/fabric/core/cclifecycle"
"github.com/hyperledger/fabric/core/cclifecycle/mocks"
"github.com/hyperledger/fabric/core/common/ccprovider"
"github.com/hyperledger/fabric/protos/common"
Expand Down
2 changes: 1 addition & 1 deletion core/chaincode/platforms/car/vm_helper_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"bytes"
"fmt"

"github.com/fsouza/go-dockerclient"
docker "github.com/fsouza/go-dockerclient"
"github.com/hyperledger/fabric/core/chaincode/platforms"
"github.com/hyperledger/fabric/core/chaincode/platforms/car"
"github.com/hyperledger/fabric/core/container"
Expand Down
2 changes: 1 addition & 1 deletion core/committer/txvalidator/plugin_validator.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (

"github.com/hyperledger/fabric/common/cauthdsl"
ledger2 "github.com/hyperledger/fabric/common/ledger"
"github.com/hyperledger/fabric/core/handlers/validation/api"
validation "github.com/hyperledger/fabric/core/handlers/validation/api"
. "github.com/hyperledger/fabric/core/handlers/validation/api/capabilities"
. "github.com/hyperledger/fabric/core/handlers/validation/api/identities"
. "github.com/hyperledger/fabric/core/handlers/validation/api/state"
Expand Down
2 changes: 1 addition & 1 deletion core/committer/txvalidator/plugin_validator_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import (
"github.com/hyperledger/fabric/core/committer/txvalidator"
"github.com/hyperledger/fabric/core/committer/txvalidator/mocks"
"github.com/hyperledger/fabric/core/committer/txvalidator/testdata"
"github.com/hyperledger/fabric/core/handlers/validation/api"
validation "github.com/hyperledger/fabric/core/handlers/validation/api"
. "github.com/hyperledger/fabric/core/handlers/validation/api/capabilities"
"github.com/hyperledger/fabric/msp"
. "github.com/hyperledger/fabric/msp/mocks"
Expand Down
2 changes: 1 addition & 1 deletion core/common/ccpackage/ccpackage_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import (
"github.com/hyperledger/fabric/common/cauthdsl"
"github.com/hyperledger/fabric/msp"
mspmgmt "github.com/hyperledger/fabric/msp/mgmt"
"github.com/hyperledger/fabric/msp/mgmt/testtools"
msptesttools "github.com/hyperledger/fabric/msp/mgmt/testtools"
"github.com/hyperledger/fabric/protos/common"
mspprotos "github.com/hyperledger/fabric/protos/msp"
"github.com/hyperledger/fabric/protos/peer"
Expand Down
2 changes: 1 addition & 1 deletion core/common/validation/fullflow_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import (
"github.com/hyperledger/fabric/common/util"
"github.com/hyperledger/fabric/msp"
mspmgmt "github.com/hyperledger/fabric/msp/mgmt"
"github.com/hyperledger/fabric/msp/mgmt/testtools"
msptesttools "github.com/hyperledger/fabric/msp/mgmt/testtools"
"github.com/hyperledger/fabric/protos/common"
"github.com/hyperledger/fabric/protos/peer"
"github.com/hyperledger/fabric/protos/utils"
Expand Down
2 changes: 1 addition & 1 deletion core/common/validation/statebased/validator_keylevel.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
"sync"

commonerrors "github.com/hyperledger/fabric/common/errors"
"github.com/hyperledger/fabric/core/handlers/validation/api/policies"
validation "github.com/hyperledger/fabric/core/handlers/validation/api/policies"
"github.com/hyperledger/fabric/core/ledger"
"github.com/hyperledger/fabric/core/ledger/kvledger/txmgmt/rwsetutil"
"github.com/hyperledger/fabric/protos/common"
Expand Down
2 changes: 1 addition & 1 deletion core/common/validation/statebased/vpmanager_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import (
"time"

"github.com/hyperledger/fabric/common/cauthdsl"
"github.com/hyperledger/fabric/core/handlers/validation/api/state"
validation "github.com/hyperledger/fabric/core/handlers/validation/api/state"
"github.com/hyperledger/fabric/protos/ledger/rwset"
"github.com/hyperledger/fabric/protos/ledger/rwset/kvrwset"
pb "github.com/hyperledger/fabric/protos/peer"
Expand Down
2 changes: 1 addition & 1 deletion core/common/validation/statebased/vpmanagerimpl.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
"sync"

"github.com/hyperledger/fabric/common/flogging"
"github.com/hyperledger/fabric/core/handlers/validation/api/state"
validation "github.com/hyperledger/fabric/core/handlers/validation/api/state"
"github.com/hyperledger/fabric/core/ledger/kvledger/txmgmt/rwsetutil"
pb "github.com/hyperledger/fabric/protos/peer"
"github.com/pkg/errors"
Expand Down
2 changes: 1 addition & 1 deletion core/endorser/plugin_endorser.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
"sync"

"github.com/hyperledger/fabric/core/chaincode/shim"
"github.com/hyperledger/fabric/core/handlers/endorsement/api"
endorsement "github.com/hyperledger/fabric/core/handlers/endorsement/api"
endorsement3 "github.com/hyperledger/fabric/core/handlers/endorsement/api/identities"
"github.com/hyperledger/fabric/core/transientstore"
pb "github.com/hyperledger/fabric/protos/peer"
Expand Down
2 changes: 1 addition & 1 deletion core/endorser/plugin_endorser_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import (
"github.com/hyperledger/fabric/core/chaincode/shim"
"github.com/hyperledger/fabric/core/endorser"
"github.com/hyperledger/fabric/core/endorser/mocks"
"github.com/hyperledger/fabric/core/handlers/endorsement/api"
endorsement "github.com/hyperledger/fabric/core/handlers/endorsement/api"
. "github.com/hyperledger/fabric/core/handlers/endorsement/api/state"
"github.com/hyperledger/fabric/core/transientstore"
"github.com/hyperledger/fabric/protos/common"
Expand Down
2 changes: 1 addition & 1 deletion core/endorser/state.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ SPDX-License-Identifier: Apache-2.0
package endorser

import (
"github.com/hyperledger/fabric/core/handlers/endorsement/api/state"
endorsement "github.com/hyperledger/fabric/core/handlers/endorsement/api/state"
"github.com/hyperledger/fabric/core/ledger"
"github.com/hyperledger/fabric/core/transientstore"
"github.com/hyperledger/fabric/protos/ledger/rwset"
Expand Down
2 changes: 1 addition & 1 deletion core/handlers/endorsement/api/identities/identities.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ SPDX-License-Identifier: Apache-2.0
package endorsement

import (
"github.com/hyperledger/fabric/core/handlers/endorsement/api"
endorsement "github.com/hyperledger/fabric/core/handlers/endorsement/api"
"github.com/hyperledger/fabric/protos/peer"
)

Expand Down
2 changes: 1 addition & 1 deletion core/handlers/endorsement/api/state/state.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ SPDX-License-Identifier: Apache-2.0
package endorsement

import (
"github.com/hyperledger/fabric/core/handlers/endorsement/api"
endorsement "github.com/hyperledger/fabric/core/handlers/endorsement/api"
"github.com/hyperledger/fabric/protos/ledger/rwset"
)

Expand Down
4 changes: 2 additions & 2 deletions core/handlers/library/library.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ import (
"github.com/hyperledger/fabric/core/handlers/auth/filter"
"github.com/hyperledger/fabric/core/handlers/decoration"
"github.com/hyperledger/fabric/core/handlers/decoration/decorator"
"github.com/hyperledger/fabric/core/handlers/endorsement/api"
endorsement "github.com/hyperledger/fabric/core/handlers/endorsement/api"
"github.com/hyperledger/fabric/core/handlers/endorsement/builtin"
"github.com/hyperledger/fabric/core/handlers/validation/api"
validation "github.com/hyperledger/fabric/core/handlers/validation/api"
. "github.com/hyperledger/fabric/core/handlers/validation/builtin"
)

Expand Down
2 changes: 1 addition & 1 deletion core/handlers/library/registry.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import (
"github.com/hyperledger/fabric/core/handlers/auth"
"github.com/hyperledger/fabric/core/handlers/decoration"
endorsement2 "github.com/hyperledger/fabric/core/handlers/endorsement/api"
"github.com/hyperledger/fabric/core/handlers/validation/api"
validation "github.com/hyperledger/fabric/core/handlers/validation/api"
)

var logger = flogging.MustGetLogger("core.handlers")
Expand Down
4 changes: 2 additions & 2 deletions core/handlers/library/registry_plugin_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ import (
"testing"

"github.com/golang/protobuf/proto"
"github.com/hyperledger/fabric/core/handlers/endorsement/api"
"github.com/hyperledger/fabric/core/handlers/validation/api"
endorsement "github.com/hyperledger/fabric/core/handlers/endorsement/api"
validation "github.com/hyperledger/fabric/core/handlers/validation/api"
"github.com/hyperledger/fabric/protos/peer"
"github.com/stretchr/testify/assert"
)
Expand Down
2 changes: 1 addition & 1 deletion core/handlers/validation/api/identities/identities.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ SPDX-License-Identifier: Apache-2.0
package validation

import (
"github.com/hyperledger/fabric/core/handlers/validation/api"
validation "github.com/hyperledger/fabric/core/handlers/validation/api"
"github.com/hyperledger/fabric/protos/msp"
)

Expand Down
2 changes: 1 addition & 1 deletion core/handlers/validation/api/policies/policies.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ SPDX-License-Identifier: Apache-2.0
package validation

import (
"github.com/hyperledger/fabric/core/handlers/validation/api"
validation "github.com/hyperledger/fabric/core/handlers/validation/api"
"github.com/hyperledger/fabric/protos/common"
)

Expand Down
2 changes: 1 addition & 1 deletion core/handlers/validation/api/state/state.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ SPDX-License-Identifier: Apache-2.0
package validation

import (
"github.com/hyperledger/fabric/core/handlers/validation/api"
validation "github.com/hyperledger/fabric/core/handlers/validation/api"
)

// State defines interaction with the world state
Expand Down
6 changes: 3 additions & 3 deletions core/handlers/validation/builtin/default_validation.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@ import (

commonerrors "github.com/hyperledger/fabric/common/errors"
"github.com/hyperledger/fabric/common/flogging"
"github.com/hyperledger/fabric/core/handlers/validation/api"
validation "github.com/hyperledger/fabric/core/handlers/validation/api"
. "github.com/hyperledger/fabric/core/handlers/validation/api/capabilities"
. "github.com/hyperledger/fabric/core/handlers/validation/api/identities"
. "github.com/hyperledger/fabric/core/handlers/validation/api/policies"
. "github.com/hyperledger/fabric/core/handlers/validation/api/state"
"github.com/hyperledger/fabric/core/handlers/validation/builtin/v12"
"github.com/hyperledger/fabric/core/handlers/validation/builtin/v13"
v12 "github.com/hyperledger/fabric/core/handlers/validation/builtin/v12"
v13 "github.com/hyperledger/fabric/core/handlers/validation/builtin/v13"
"github.com/hyperledger/fabric/protos/common"
"github.com/pkg/errors"
)
Expand Down
2 changes: 1 addition & 1 deletion core/handlers/validation/token/validation.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ SPDX-License-Identifier: Apache-2.0
package token

import (
"github.com/hyperledger/fabric/core/handlers/validation/api"
validation "github.com/hyperledger/fabric/core/handlers/validation/api"
"github.com/hyperledger/fabric/protos/common"
)

Expand Down
Loading

0 comments on commit 2dbf8d6

Please sign in to comment.