Skip to content

Commit 6a6318b

Browse files
authored
go.mod: usegopkg.in/yaml.v3 instead of github.com/go-yaml/yaml (#27295)
1 parent c08dc59 commit 6a6318b

File tree

3 files changed

+3
-6
lines changed

3 files changed

+3
-6
lines changed

beacon/types/config.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import (
2727
"github.com/ethereum/go-ethereum/beacon/merkle"
2828
"github.com/ethereum/go-ethereum/common"
2929
"github.com/ethereum/go-ethereum/common/hexutil"
30-
"github.com/go-yaml/yaml"
30+
"gopkg.in/yaml.v3"
3131
)
3232

3333
// syncCommitteeDomain specifies the signatures specific use to avoid clashes
@@ -121,7 +121,7 @@ func (c *ChainConfig) AddFork(name string, epoch uint64, version []byte) *ChainC
121121

122122
c.Forks = append(c.Forks, fork)
123123
sort.Sort(c.Forks)
124-
124+
125125
return c
126126
}
127127

go.mod

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ require (
2727
github.com/gballet/go-libpcsclite v0.0.0-20190607065134-2772fd86a8ff
2828
github.com/gballet/go-verkle v0.0.0-20220902153445-097bd83b7732
2929
github.com/go-stack/stack v1.8.1
30-
github.com/go-yaml/yaml v2.1.0+incompatible
3130
github.com/gofrs/flock v0.8.1
3231
github.com/golang-jwt/jwt/v4 v4.3.0
3332
github.com/golang/protobuf v1.5.2
@@ -70,6 +69,7 @@ require (
7069
golang.org/x/tools v0.7.0
7170
gopkg.in/natefinch/lumberjack.v2 v2.0.0
7271
gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce
72+
gopkg.in/yaml.v3 v3.0.1
7373
)
7474

7575
require (
@@ -127,6 +127,5 @@ require (
127127
golang.org/x/xerrors v0.0.0-20220517211312-f3a8303e98df // indirect
128128
google.golang.org/protobuf v1.28.1 // indirect
129129
gopkg.in/yaml.v2 v2.4.0 // indirect
130-
gopkg.in/yaml.v3 v3.0.1 // indirect
131130
rsc.io/tmplfunc v0.0.3 // indirect
132131
)

go.sum

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -164,8 +164,6 @@ github.com/go-sourcemap/sourcemap v2.1.3+incompatible h1:W1iEw64niKVGogNgBN3ePyL
164164
github.com/go-sourcemap/sourcemap v2.1.3+incompatible/go.mod h1:F8jJfvm2KbVjc5NqelyYJmf/v5J0dwNLS2mL4sNA1Jg=
165165
github.com/go-stack/stack v1.8.1 h1:ntEHSVwIt7PNXNpgPmVfMrNhLtgjlmnZha2kOpuRiDw=
166166
github.com/go-stack/stack v1.8.1/go.mod h1:dcoOX6HbPZSZptuspn9bctJ+N/CnF5gGygcUP3XYfe4=
167-
github.com/go-yaml/yaml v2.1.0+incompatible h1:RYi2hDdss1u4YE7GwixGzWwVo47T8UQwnTLB6vQiq+o=
168-
github.com/go-yaml/yaml v2.1.0+incompatible/go.mod h1:w2MrLa16VYP0jy6N7M5kHaCkaLENm+P+Tv+MfurjSw0=
169167
github.com/gobwas/httphead v0.0.0-20180130184737-2c6c146eadee/go.mod h1:L0fX3K22YWvt/FAX9NnzrNzcI4wNYi9Yku4O0LKYflo=
170168
github.com/gobwas/pool v0.2.0/go.mod h1:q8bcK0KcYlCgd9e7WYLm9LpyS+YeLd8JVDW6WezmKEw=
171169
github.com/gobwas/ws v1.0.2/go.mod h1:szmBTxLgaFppYjEmNtny/v3w89xOydFnnZMcgRRu/EM=

0 commit comments

Comments
 (0)