X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=database%2Fcache_test.go;h=b88ad3a343667d5f83309b0b8c59fe698b784a8c;hb=b057187a9b3143ad580169bfa1d94f28784a1ca9;hp=a15f3b39643c748654e25ac6826cbe1a1671c57c;hpb=42c5ab23c13e7f43d0055221ec38752555bd987e;p=bytom%2Fvapor.git

diff --git a/database/cache_test.go b/database/cache_test.go
index a15f3b39..b88ad3a3 100644
--- a/database/cache_test.go
+++ b/database/cache_test.go
@@ -17,8 +17,8 @@ func TestBlockCache(t *testing.T) {
 		}
 	}
 
-	newVoteResult := func(seq uint64) *state.VoteResult {
-		return &state.VoteResult{
+	newConsensusResult := func(seq uint64) *state.ConsensusResult {
+		return &state.ConsensusResult{
 			Seq: seq,
 		}
 	}
@@ -34,10 +34,10 @@ func TestBlockCache(t *testing.T) {
 		blockIndexHashes[block.Height] = append(blockIndexHashes[block.Height], &hash)
 	}
 
-	voteResults := make(map[uint64]*state.VoteResult)
-	for i := 0; i < maxCachedVoteResults+10; i++ {
-		voteResult := newVoteResult(uint64(i))
-		voteResults[voteResult.Seq] = voteResult
+	consensusResults := make(map[uint64]*state.ConsensusResult)
+	for i := 0; i < maxCachedConsensusResults+10; i++ {
+		consensusResult := newConsensusResult(uint64(i))
+		consensusResults[consensusResult.Seq] = consensusResult
 	}
 
 	fillBlockHeaderFn := func(hash *bc.Hash) (*types.BlockHeader, error) {
@@ -56,11 +56,11 @@ func TestBlockCache(t *testing.T) {
 		return blockHashes[height], nil
 	}
 
-	fillVoteResultFn := func(seq uint64) (*state.VoteResult, error) {
-		return voteResults[seq], nil
+	fillConsensusResultFn := func(seq uint64) (*state.ConsensusResult, error) {
+		return consensusResults[seq], nil
 	}
 
-	cache := newCache(fillBlockHeaderFn, fillBlockTxsFn, fillBlockHashesFn, fillMainChainHashFn, fillVoteResultFn)
+	cache := newCache(fillBlockHeaderFn, fillBlockTxsFn, fillBlockHashesFn, fillMainChainHashFn, fillConsensusResultFn)
 	for i := 0; i < maxCachedBlockHeaders+10; i++ {
 		block := newBlock(uint64(i))
 		hash := block.Hash()
@@ -143,21 +143,21 @@ func TestBlockCache(t *testing.T) {
 		}
 	}
 
-	for i := 0; i < maxCachedVoteResults+10; i++ {
-		voteResult := newVoteResult(uint64(i))
-		cache.lookupVoteResult(voteResult.Seq)
+	for i := 0; i < maxCachedConsensusResults+10; i++ {
+		consensusResult := newConsensusResult(uint64(i))
+		cache.lookupConsensusResult(consensusResult.Seq)
 	}
 
 	for i := 0; i < 10; i++ {
-		voteResult := newVoteResult(uint64(i))
-		if _, ok := cache.lruVoteResults.Get(voteResult.Seq); ok {
+		consensusResult := newConsensusResult(uint64(i))
+		if _, ok := cache.lruConsensusResults.Get(consensusResult.Seq); ok {
 			t.Fatalf("find old vote result")
 		}
 	}
 
-	for i := 10; i < maxCachedVoteResults+10; i++ {
-		voteResult := newVoteResult(uint64(i))
-		if _, ok := cache.lruVoteResults.Get(voteResult.Seq); !ok {
+	for i := 10; i < maxCachedConsensusResults+10; i++ {
+		consensusResult := newConsensusResult(uint64(i))
+		if _, ok := cache.lruConsensusResults.Get(consensusResult.Seq); !ok {
 			t.Fatalf("can't find new vote result")
 		}
 	}