From 0b8f66ed9ef177dc72442dd7ba337c6733e30344 Mon Sep 17 00:00:00 2001
From: obscuren <geffobscura@gmail.com>
Date: Sun, 15 Mar 2015 21:47:59 +0100
Subject: updated godep ethash

---
 Godeps/Godeps.json                                         | 4 ++--
 Godeps/_workspace/src/github.com/ethereum/ethash/ethash.go | 6 ++++--
 2 files changed, 6 insertions(+), 4 deletions(-)

(limited to 'Godeps')

diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
index 988c21d4f..e6eab504d 100644
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -22,8 +22,8 @@
 		},
 		{
 			"ImportPath": "github.com/ethereum/ethash",
-			"Comment": "v23-11-g5376ec8",
-			"Rev": "5376ec8816d6bf787d4fc91a08b4527bc5e1f469"
+			"Comment": "v23-12-g149261a",
+			"Rev": "149261a5d7cafc3943cbcf1d370082ec70d81e8b"
 		},
 		{
 			"ImportPath": "github.com/ethereum/serpent-go",
diff --git a/Godeps/_workspace/src/github.com/ethereum/ethash/ethash.go b/Godeps/_workspace/src/github.com/ethereum/ethash/ethash.go
index 6f1302bb8..1f615058d 100644
--- a/Godeps/_workspace/src/github.com/ethereum/ethash/ethash.go
+++ b/Godeps/_workspace/src/github.com/ethereum/ethash/ethash.go
@@ -102,7 +102,9 @@ func makeParamsAndCache(chainManager pow.ChainManager, blockNum uint64) (*Params
 
 func (pow *Ethash) UpdateCache(force bool) error {
 	pow.cacheMutex.Lock()
-	thisEpoch := pow.chainManager.CurrentBlock().NumberU64()
+	defer pow.cacheMutex.Unlock()
+
+	thisEpoch := pow.chainManager.CurrentBlock().NumberU64() / epochLength
 	if force || pow.paramsAndCache.Epoch != thisEpoch {
 		var err error
 		pow.paramsAndCache, err = makeParamsAndCache(pow.chainManager, pow.chainManager.CurrentBlock().NumberU64())
@@ -110,7 +112,7 @@ func (pow *Ethash) UpdateCache(force bool) error {
 			panic(err)
 		}
 	}
-	pow.cacheMutex.Unlock()
+
 	return nil
 }
 
-- 
cgit