Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cmd/common/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
"github.com/hyperledger/fabric/cmd/common/comm"
"github.com/hyperledger/fabric/cmd/common/signer"
"github.com/pkg/errors"
"gopkg.in/yaml.v3"
"go.yaml.in/yaml/v4"
)

// Config aggregates configuration of TLS and signing
Expand Down
3 changes: 1 addition & 2 deletions cmd/cryptogen/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,8 @@ import (
"github.com/hyperledger/fabric/internal/cryptogen/csp"
"github.com/hyperledger/fabric/internal/cryptogen/metadata"
"github.com/hyperledger/fabric/internal/cryptogen/msp"

"go.yaml.in/yaml/v4"
"gopkg.in/alecthomas/kingpin.v2"
"gopkg.in/yaml.v3"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion cmd/cryptogen/main_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"testing"

"github.com/stretchr/testify/require"
yaml "gopkg.in/yaml.v3"
"go.yaml.in/yaml/v4"
)

func TestDefaultConfigParsing(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion common/viperutil/config_util.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (
"github.com/hyperledger/fabric-lib-go/bccsp/factory"
"github.com/hyperledger/fabric-lib-go/common/flogging"
"github.com/pkg/errors"
"gopkg.in/yaml.v3"
"go.yaml.in/yaml/v4"
)

var logger = flogging.MustGetLogger("viperutil")
Expand Down
3 changes: 2 additions & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,10 @@ require (
go.etcd.io/etcd/server/v3 v3.6.10
go.etcd.io/raft/v3 v3.6.0
go.uber.org/zap v1.27.1
go.yaml.in/yaml/v4 v4.0.0-rc.4
google.golang.org/grpc v1.79.3
google.golang.org/protobuf v1.36.11
gopkg.in/alecthomas/kingpin.v2 v2.2.6
gopkg.in/yaml.v3 v3.0.1
)

require (
Expand Down Expand Up @@ -124,4 +124,5 @@ require (
golang.org/x/tools v0.42.0 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20251202230838-ff82c1b0f217 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20260319201613-d00831a3d3e7 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)
2 changes: 2 additions & 0 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -1158,6 +1158,8 @@ go.uber.org/zap v1.27.1 h1:08RqriUEv8+ArZRYSTXy1LeBScaMpVSTBhCeaZYfMYc=
go.uber.org/zap v1.27.1/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E=
go.yaml.in/yaml/v3 v3.0.4 h1:tfq32ie2Jv2UxXFdLJdh3jXuOzWiL1fo0bu/FbuKpbc=
go.yaml.in/yaml/v3 v3.0.4/go.mod h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg=
go.yaml.in/yaml/v4 v4.0.0-rc.4 h1:UP4+v6fFrBIb1l934bDl//mmnoIZEDK0idg1+AIvX5U=
go.yaml.in/yaml/v4 v4.0.0-rc.4/go.mod h1:aZqd9kCMsGL7AuUv/m/PvWLdg5sjJsZ4oHDEnfPPfY0=
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
Expand Down
2 changes: 1 addition & 1 deletion integration/msp/rsaca_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ import (
"github.com/onsi/gomega/gexec"
"github.com/tedsuo/ifrit"
ginkgomon "github.com/tedsuo/ifrit/ginkgomon_v2"
"gopkg.in/yaml.v3"
"go.yaml.in/yaml/v4"
)

var _ = Describe("MSPs with RSA Certificate Authorities", func() {
Expand Down
2 changes: 1 addition & 1 deletion integration/nwo/network.go
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,10 @@ import (
"github.com/tedsuo/ifrit"
ginkgomon "github.com/tedsuo/ifrit/ginkgomon_v2"
"github.com/tedsuo/ifrit/grouper"
"go.yaml.in/yaml/v4"
"google.golang.org/grpc"
"google.golang.org/grpc/credentials"
"google.golang.org/protobuf/proto"
"gopkg.in/yaml.v3"
)

// Blocks defines block cutting config.
Expand Down
2 changes: 1 addition & 1 deletion internal/cryptogen/msp/msp.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import (
"github.com/hyperledger/fabric/internal/cryptogen/csp"
fabricmsp "github.com/hyperledger/fabric/msp"
"github.com/pkg/errors"
"gopkg.in/yaml.v3"
"go.yaml.in/yaml/v4"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion internal/cryptogen/msp/msp_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import (
"github.com/hyperledger/fabric/internal/cryptogen/msp"
fabricmsp "github.com/hyperledger/fabric/msp"
"github.com/stretchr/testify/require"
"gopkg.in/yaml.v3"
"go.yaml.in/yaml/v4"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion internal/peer/common/networkconfig.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"os"

"github.com/pkg/errors"
"gopkg.in/yaml.v3"
"go.yaml.in/yaml/v4"
)

// NetworkConfig provides a static definition of a Hyperledger Fabric network
Expand Down
2 changes: 1 addition & 1 deletion internal/peer/node/start.go
Original file line number Diff line number Diff line change
Expand Up @@ -99,10 +99,10 @@ import (
"github.com/pkg/errors"
"github.com/spf13/cobra"
"github.com/spf13/viper"
"go.yaml.in/yaml/v4"
"google.golang.org/grpc"
"google.golang.org/grpc/credentials/insecure"
"google.golang.org/protobuf/proto"
"gopkg.in/yaml.v3"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion msp/configbuilder.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ import (
"github.com/hyperledger/fabric-lib-go/bccsp/factory"
"github.com/hyperledger/fabric-protos-go-apiv2/msp"
"github.com/pkg/errors"
"go.yaml.in/yaml/v4"
"google.golang.org/protobuf/proto"
"gopkg.in/yaml.v3"
)

// OrganizationalUnitIdentifiersConfiguration is used to represent an OU
Expand Down
10 changes: 10 additions & 0 deletions vendor/go.yaml.in/yaml/v4/.gitignore

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

33 changes: 33 additions & 0 deletions vendor/go.yaml.in/yaml/v4/.typos.toml

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

210 changes: 210 additions & 0 deletions vendor/go.yaml.in/yaml/v4/CONTRIBUTING.md

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

Loading