ran gofmt @ v1.17, these are the resulting changes (#10362)

* ran gofmt @ v1.17, these are the resulting changes

* fix some flaky tests that are tripping up this PR

* gofmt

Co-authored-by: Kasey Kirkham <kasey@users.noreply.github.com>
This commit is contained in:
kasey
2022-03-14 15:58:13 -05:00
committed by GitHub
parent 5461c5b84f
commit 0b1a777d62
62 changed files with 74 additions and 1 deletions

View File

@@ -16,10 +16,13 @@ func TestHeadSlot_DataRace(t *testing.T) {
s := &Service{ s := &Service{
cfg: &config{BeaconDB: beaconDB}, cfg: &config{BeaconDB: beaconDB},
} }
wait := make(chan struct{})
go func() { go func() {
defer close(wait)
require.NoError(t, s.saveHead(context.Background(), [32]byte{})) require.NoError(t, s.saveHead(context.Background(), [32]byte{}))
}() }()
s.HeadSlot() s.HeadSlot()
<-wait
} }
func TestHeadRoot_DataRace(t *testing.T) { func TestHeadRoot_DataRace(t *testing.T) {
@@ -28,11 +31,14 @@ func TestHeadRoot_DataRace(t *testing.T) {
cfg: &config{BeaconDB: beaconDB, StateGen: stategen.New(beaconDB)}, cfg: &config{BeaconDB: beaconDB, StateGen: stategen.New(beaconDB)},
head: &head{root: [32]byte{'A'}}, head: &head{root: [32]byte{'A'}},
} }
wait := make(chan struct{})
go func() { go func() {
defer close(wait)
require.NoError(t, s.saveHead(context.Background(), [32]byte{})) require.NoError(t, s.saveHead(context.Background(), [32]byte{}))
}() }()
_, err := s.HeadRoot(context.Background()) _, err := s.HeadRoot(context.Background())
require.NoError(t, err) require.NoError(t, err)
<-wait
} }
func TestHeadBlock_DataRace(t *testing.T) { func TestHeadBlock_DataRace(t *testing.T) {
@@ -41,11 +47,14 @@ func TestHeadBlock_DataRace(t *testing.T) {
cfg: &config{BeaconDB: beaconDB, StateGen: stategen.New(beaconDB)}, cfg: &config{BeaconDB: beaconDB, StateGen: stategen.New(beaconDB)},
head: &head{block: wrapper.WrappedPhase0SignedBeaconBlock(&ethpb.SignedBeaconBlock{})}, head: &head{block: wrapper.WrappedPhase0SignedBeaconBlock(&ethpb.SignedBeaconBlock{})},
} }
wait := make(chan struct{})
go func() { go func() {
defer close(wait)
require.NoError(t, s.saveHead(context.Background(), [32]byte{})) require.NoError(t, s.saveHead(context.Background(), [32]byte{}))
}() }()
_, err := s.HeadBlock(context.Background()) _, err := s.HeadBlock(context.Background())
require.NoError(t, err) require.NoError(t, err)
<-wait
} }
func TestHeadState_DataRace(t *testing.T) { func TestHeadState_DataRace(t *testing.T) {
@@ -53,9 +62,12 @@ func TestHeadState_DataRace(t *testing.T) {
s := &Service{ s := &Service{
cfg: &config{BeaconDB: beaconDB, StateGen: stategen.New(beaconDB)}, cfg: &config{BeaconDB: beaconDB, StateGen: stategen.New(beaconDB)},
} }
wait := make(chan struct{})
go func() { go func() {
defer close(wait)
require.NoError(t, s.saveHead(context.Background(), [32]byte{})) require.NoError(t, s.saveHead(context.Background(), [32]byte{}))
}() }()
_, err := s.HeadState(context.Background()) _, err := s.HeadState(context.Background())
require.NoError(t, err) require.NoError(t, err)
<-wait
} }

View File

@@ -1,3 +1,4 @@
//go:build !develop
// +build !develop // +build !develop
package blockchain package blockchain

View File

@@ -1,3 +1,4 @@
//go:build fuzz
// +build fuzz // +build fuzz
package cache package cache

View File

@@ -1,3 +1,4 @@
//go:build fuzz
// +build fuzz // +build fuzz
// This file is used in fuzzer builds to bypass global committee caches. // This file is used in fuzzer builds to bypass global committee caches.

View File

@@ -1,3 +1,4 @@
//go:build !fuzz
// +build !fuzz // +build !fuzz
package cache package cache

View File

@@ -1,3 +1,4 @@
//go:build fuzz
// +build fuzz // +build fuzz
// This file is used in fuzzer builds to bypass proposer indices caches. // This file is used in fuzzer builds to bypass proposer indices caches.

View File

@@ -1,3 +1,4 @@
//go:build !fuzz
// +build !fuzz // +build !fuzz
package cache package cache

View File

@@ -1,3 +1,4 @@
//go:build fuzz
// +build fuzz // +build fuzz
package cache package cache

View File

@@ -1,3 +1,4 @@
//go:build !minimal
// +build !minimal // +build !minimal
package v1 package v1

View File

@@ -1,3 +1,4 @@
//go:build !minimal
// +build !minimal // +build !minimal
package v1 package v1

View File

@@ -1,3 +1,4 @@
//go:build minimal
// +build minimal // +build minimal
package v1 package v1

View File

@@ -1,3 +1,4 @@
//go:build minimal
// +build minimal // +build minimal
package v1 package v1

View File

@@ -1,3 +1,4 @@
//go:build !minimal
// +build !minimal // +build !minimal
package v2 package v2

View File

@@ -1,3 +1,4 @@
//go:build !minimal
// +build !minimal // +build !minimal
package v2 package v2

View File

@@ -1,3 +1,4 @@
//go:build minimal
// +build minimal // +build minimal
package v2 package v2

View File

@@ -1,3 +1,4 @@
//go:build minimal
// +build minimal // +build minimal
package v2 package v2

View File

@@ -1,3 +1,4 @@
//go:build !minimal
// +build !minimal // +build !minimal
package v3 package v3

View File

@@ -1,3 +1,4 @@
//go:build !minimal
// +build !minimal // +build !minimal
package v3 package v3

View File

@@ -1,3 +1,4 @@
//go:build minimal
// +build minimal // +build minimal
package v3 package v3

View File

@@ -1,3 +1,4 @@
//go:build minimal
// +build minimal // +build minimal
package v3 package v3

View File

@@ -1,3 +1,4 @@
//go:build !minimal
// +build !minimal // +build !minimal
package field_params package field_params

View File

@@ -1,3 +1,4 @@
//go:build !minimal
// +build !minimal // +build !minimal
package field_params_test package field_params_test

View File

@@ -1,3 +1,4 @@
//go:build minimal
// +build minimal // +build minimal
package field_params package field_params

View File

@@ -1,3 +1,4 @@
//go:build minimal
// +build minimal // +build minimal
package field_params_test package field_params_test

View File

@@ -1,3 +1,4 @@
//go:build !develop
// +build !develop // +build !develop
package params_test package params_test

View File

@@ -1,3 +1,4 @@
//go:build develop
// +build develop // +build develop
package params package params

View File

@@ -1,3 +1,4 @@
//go:build !develop
// +build !develop // +build !develop
package params package params

View File

@@ -1,3 +1,4 @@
//go:build ((linux && amd64) || (linux && arm64) || (darwin && amd64) || (darwin && arm64) || (windows && amd64)) && !blst_disabled
// +build linux,amd64 linux,arm64 darwin,amd64 darwin,arm64 windows,amd64 // +build linux,amd64 linux,arm64 darwin,amd64 darwin,arm64 windows,amd64
// +build !blst_disabled // +build !blst_disabled

View File

@@ -1,3 +1,4 @@
//go:build ((linux && amd64) || (linux && arm64) || (darwin && amd64) || (darwin && arm64) || (windows && amd64)) && !blst_disabled
// +build linux,amd64 linux,arm64 darwin,amd64 darwin,arm64 windows,amd64 // +build linux,amd64 linux,arm64 darwin,amd64 darwin,arm64 windows,amd64
// +build !blst_disabled // +build !blst_disabled

View File

@@ -1,3 +1,4 @@
//go:build ((linux && amd64) || (linux && arm64) || (darwin && amd64) || (darwin && arm64) || (windows && amd64)) && !blst_disabled
// +build linux,amd64 linux,arm64 darwin,amd64 darwin,arm64 windows,amd64 // +build linux,amd64 linux,arm64 darwin,amd64 darwin,arm64 windows,amd64
// +build !blst_disabled // +build !blst_disabled

View File

@@ -1,3 +1,4 @@
//go:build ((linux && amd64) || (linux && arm64) || (darwin && amd64) || (darwin && arm64) || (windows && amd64)) && !blst_disabled
// +build linux,amd64 linux,arm64 darwin,amd64 darwin,arm64 windows,amd64 // +build linux,amd64 linux,arm64 darwin,amd64 darwin,arm64 windows,amd64
// +build !blst_disabled // +build !blst_disabled

View File

@@ -1,3 +1,4 @@
//go:build ((linux && amd64) || (linux && arm64) || (darwin && amd64) || (darwin && arm64) || (windows && amd64)) && !blst_disabled
// +build linux,amd64 linux,arm64 darwin,amd64 darwin,arm64 windows,amd64 // +build linux,amd64 linux,arm64 darwin,amd64 darwin,arm64 windows,amd64
// +build !blst_disabled // +build !blst_disabled

View File

@@ -1,3 +1,4 @@
//go:build ((linux && amd64) || (linux && arm64) || (darwin && amd64) || (darwin && arm64) || (windows && amd64)) && !blst_disabled
// +build linux,amd64 linux,arm64 darwin,amd64 darwin,arm64 windows,amd64 // +build linux,amd64 linux,arm64 darwin,amd64 darwin,arm64 windows,amd64
// +build !blst_disabled // +build !blst_disabled

View File

@@ -1,3 +1,4 @@
//go:build ((linux && amd64) || (linux && arm64) || (darwin && amd64) || (darwin && arm64) || (windows && amd64)) && !blst_disabled
// +build linux,amd64 linux,arm64 darwin,amd64 darwin,arm64 windows,amd64 // +build linux,amd64 linux,arm64 darwin,amd64 darwin,arm64 windows,amd64
// +build !blst_disabled // +build !blst_disabled

View File

@@ -1,3 +1,4 @@
//go:build ((linux && amd64) || (linux && arm64) || (darwin && amd64) || (darwin && arm64) || (windows && amd64)) && !blst_disabled
// +build linux,amd64 linux,arm64 darwin,amd64 darwin,arm64 windows,amd64 // +build linux,amd64 linux,arm64 darwin,amd64 darwin,arm64 windows,amd64
// +build !blst_disabled // +build !blst_disabled

View File

@@ -1,3 +1,4 @@
//go:build ((linux && amd64) || (linux && arm64) || (darwin && amd64) || (darwin && arm64) || (windows && amd64)) && !blst_disabled
// +build linux,amd64 linux,arm64 darwin,amd64 darwin,arm64 windows,amd64 // +build linux,amd64 linux,arm64 darwin,amd64 darwin,arm64 windows,amd64
// +build !blst_disabled // +build !blst_disabled

View File

@@ -1,4 +1,5 @@
// +build blst_disabled fuzz //go:build blst_disabled || fuzz
// +build blst_disabled fuzz
package blst package blst

View File

@@ -1,3 +1,4 @@
//go:build !linux
// +build !linux // +build !linux
package journald package journald

View File

@@ -1,3 +1,4 @@
//go:build linux
// +build linux // +build linux
package journald package journald

View File

@@ -1,3 +1,4 @@
//go:build ignore
// +build ignore // +build ignore
package ignore package ignore

View File

@@ -1,3 +1,4 @@
//go:build ignore
// +build ignore // +build ignore
package ignore package ignore

View File

@@ -1,3 +1,4 @@
//go:build ignore
// +build ignore // +build ignore
package ignore package ignore

View File

@@ -1,3 +1,4 @@
//go:build ignore
// +build ignore // +build ignore
package ignore package ignore

View File

@@ -1,3 +1,4 @@
//go:build ignore
// +build ignore // +build ignore
package ignore package ignore

View File

@@ -1,3 +1,4 @@
//go:build ignore
// +build ignore // +build ignore
package ignore package ignore

View File

@@ -1,3 +1,4 @@
//go:build ignore
// +build ignore // +build ignore
package ignore package ignore

View File

@@ -1,3 +1,4 @@
//go:build ignore
// +build ignore // +build ignore
package ignore package ignore

View File

@@ -1,3 +1,4 @@
//go:build ignore
// +build ignore // +build ignore
package ignore package ignore

View File

@@ -1,3 +1,4 @@
//go:build ignore
// +build ignore // +build ignore
package ignore package ignore

View File

@@ -1,3 +1,4 @@
//go:build ignore
// +build ignore // +build ignore
package ignore package ignore

View File

@@ -1,3 +1,4 @@
//go:build ignore
// +build ignore // +build ignore
package ignore package ignore

View File

@@ -1,3 +1,4 @@
//go:build ignore
// +build ignore // +build ignore
package ignore package ignore

View File

@@ -1,3 +1,4 @@
//go:build ignore
// +build ignore // +build ignore
package ignore package ignore

View File

@@ -1,3 +1,4 @@
//go:build ignore
// +build ignore // +build ignore
package ignore package ignore

View File

@@ -1,3 +1,4 @@
//go:build ignore
// +build ignore // +build ignore
package ignore package ignore

View File

@@ -1,3 +1,4 @@
//go:build ignore
// +build ignore // +build ignore
package ignore package ignore

View File

@@ -1,3 +1,4 @@
//go:build ignore
// +build ignore // +build ignore
package ignore package ignore

View File

@@ -1,3 +1,4 @@
//go:build ignore
// +build ignore // +build ignore
package ignore package ignore

View File

@@ -1,3 +1,4 @@
//go:build !minimal
// +build !minimal // +build !minimal
package eth package eth

View File

@@ -1,3 +1,4 @@
//go:build minimal
// +build minimal // +build minimal
package eth package eth

View File

@@ -1,3 +1,4 @@
//go:build tools
// +build tools // +build tools
package testing package testing

View File

@@ -1,3 +1,4 @@
//go:build cgosymbolizer_enabled
// +build cgosymbolizer_enabled // +build cgosymbolizer_enabled
package debug package debug