fix race condition when persisting to disk

ethereum/stat/stat_recorder_test.go

@@ -10,8 +10,8 @@ import (
 	"time"
 )
 
-var rig *ethereum.Rig = ethereum.NewRig("testrig")
-var rig2 *ethereum.Rig = ethereum.NewRig("anotherrig")
+var rig *ethereum.Rig = ethereum.NewRig("testrig", "192.168.1.2")
+var rig2 *ethereum.Rig = ethereum.NewRig("anotherrig", "192.168.1.3")
 
 func newStatRecorder() *StatRecorder {
 	return &StatRecorder{

protocol/test_rig.go

@@ -6,3 +6,7 @@ type testRig struct {
 func (r *testRig) ID() string {
 	return "rig"
 }
+
+func (r *testRig) IP() string {
+	return "127.0.0.1"
+}

run_test.sh

@@ -1 +1 @@
-build/env.sh go test -ldflags -s `go list ./... | grep -v vendor | grep -v experiment`
+build/env.sh go test -ldflags -s `go list ./... | grep -v vendor | grep -v experiment | grep -v ethash`

storage/gob_file_storage.go

@@ -77,8 +77,6 @@ func getName(value interface{}) string {
 }
 
 func (gfs *GobFileStorage) register(value interface{}) {
-	gfs.mu.Lock()
-	defer gfs.mu.Unlock()
 	name := getName(value)
 	if _, found := gfs.registeredType[name]; !found {
 		gob.Register(value)
@@ -102,13 +100,17 @@ func (gfs *GobFileStorage) persistToFile(data interface{}, id string) error {
 }
 
 func (gfs *GobFileStorage) Persist(data interface{}, id string) error {
+	gfs.mu.Lock()
+	defer gfs.mu.Unlock()
 	if err := gfs.persistToFile(data, id); err != nil {
 		return err
 	}
 	return os.Rename(getTempFile(id), getFile(id))
 }
 
 func (gfs *GobFileStorage) Load(data interface{}, id string) (interface{}, error) {
+	gfs.mu.Lock()
+	defer gfs.mu.Unlock()
 	f, err := os.Open(getFile(id))
 	if err != nil {
 		return data, err