Merge branch 'import-race' of github.com:MariusVanDerWijden/go-ethereum into import-race

This commit is contained in:
Marius van der Wijden 2020-04-21 16:13:26 +02:00
commit 51958ac264

View file

@ -67,7 +67,7 @@ type KeyStore struct {
updating bool // Whether the event notification loop is running updating bool // Whether the event notification loop is running
mu sync.RWMutex mu sync.RWMutex
importMu sync.RWMutex // Import Mutex locks the import to prevent two insertions from racing importMu sync.Mutex // Import Mutex locks the import to prevent two insertions from racing
} }
type unlocked struct { type unlocked struct {