Patch for concurrent iterator & others (onto v1.11.6) #386

Closed
roysc wants to merge 1565 commits from v1.11.6-statediff-v5 into master
Showing only changes of commit 733d76a88d - Show all commits

View File

@ -115,7 +115,7 @@ func TestNodeKeyPersistency(t *testing.T) {
}
config := &Config{Name: "unit-test", DataDir: dir, P2P: p2p.Config{PrivateKey: key}}
config.NodeKey()
if _, err := os.Stat(filepath.Join(keyfile)); err == nil {
if _, err := os.Stat(keyfile); err == nil {
t.Fatalf("one-shot node key persisted to data directory")
}
@ -136,7 +136,7 @@ func TestNodeKeyPersistency(t *testing.T) {
// Configure a new node and ensure the previously persisted key is loaded
config = &Config{Name: "unit-test", DataDir: dir}
config.NodeKey()
blob2, err := os.ReadFile(filepath.Join(keyfile))
blob2, err := os.ReadFile(keyfile)
if err != nil {
t.Fatalf("failed to read previously persisted node key: %v", err)
}