seedhammer/dcrd
seedhammer/dcrd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

blockchain: Remove redundant stake ver calc func.

Browse Source 
This removes the calcStakeVersionByNode in favor of just using
calcStakeVersion directly since the latter already takes the node and
the former is a simple pass through with no additional handling.
This commit is contained in:
Dave Collins 2018-02-25 14:32:56 -06:00
parent 7cd713dddf
commit b661ebdfd5
No known key found for this signature in database
GPG Key ID: B8904D9D9C93D1F2
2 changed files with 9 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
blockchain/stakeversion.go
View File

@ -410,14 +410,6 @@ func (b *BlockChain) calcStakeVersionByHash(hash *chainhash.Hash) (uint32, error
return 0, err
}
return b.calcStakeVersionByNode(prevNode)
}
// calcStakeVersionByNode is identical to calcStakeVersionByHash but takes a
// *blockNode instead.
//
// This function MUST be called with the chain state lock held (for writes).
func (b *BlockChain) calcStakeVersionByNode(prevNode *blockNode) (uint32, error) {
return b.calcStakeVersion(prevNode), nil
}

46
blockchain/stakeversion_test.go
View File

@ -164,10 +164,7 @@ func TestCalcStakeVersionCorners(t *testing.T) {
// Generate 3 intervals with v2 votes and calculated stake version.
for i := int64(0); i < svi*3; i++ {
sv, err := bc.calcStakeVersionByNode(node)
if err != nil {
t.Fatalf("calcStakeVersionByNode: unexpected error: %v", err)
}
sv := bc.calcStakeVersion(node)
// Set vote and stake versions.
node = newFakeNode(node, 3, sv, 0, time.Now())
@ -189,10 +186,7 @@ func TestCalcStakeVersionCorners(t *testing.T) {
// Generate 3 intervals with v4 votes and calculated stake version.
for i := int64(0); i < svi*3; i++ {
sv, err := bc.calcStakeVersionByNode(node)
if err != nil {
t.Fatalf("calcStakeVersionByNode: unexpected error: %v", err)
}
sv := bc.calcStakeVersion(node)
// Set vote and stake versions.
node = newFakeNode(node, 3, sv, 0, time.Now())
@ -215,10 +209,7 @@ func TestCalcStakeVersionCorners(t *testing.T) {
// Generate 3 intervals with v2 votes and calculated stake version.
for i := int64(0); i < svi*3; i++ {
sv, err := bc.calcStakeVersionByNode(node)
if err != nil {
t.Fatalf("calcStakeVersionByNode: unexpected error: %v", err)
}
sv := bc.calcStakeVersion(node)
// Set vote and stake versions.
node = newFakeNode(node, 3, sv, 0, time.Now())
@ -243,10 +234,7 @@ func TestCalcStakeVersionCorners(t *testing.T) {
// Generate 2 intervals with v5 votes and calculated stake version.
for i := int64(0); i < svi*2; i++ {
sv, err := bc.calcStakeVersionByNode(node)
if err != nil {
t.Fatalf("calcStakeVersionByNode: unexpected error: %v", err)
}
sv := bc.calcStakeVersion(node)
// Set vote and stake versions.
node = newFakeNode(node, 3, sv, 0, time.Now())
@ -269,10 +257,7 @@ func TestCalcStakeVersionCorners(t *testing.T) {
// Generate 1 interval with v4 votes to test the edge condition.
for i := int64(0); i < svi; i++ {
sv, err := bc.calcStakeVersionByNode(node)
if err != nil {
t.Fatalf("calcStakeVersionByNode: unexpected error: %v", err)
}
sv := bc.calcStakeVersion(node)
// Set vote and stake versions.
node = newFakeNode(node, 3, sv, 0, time.Now())
@ -298,10 +283,7 @@ func TestCalcStakeVersionCorners(t *testing.T) {
// Generate another interval with v4 votes.
for i := int64(0); i < svi; i++ {
sv, err := bc.calcStakeVersionByNode(node)
if err != nil {
t.Fatalf("calcStakeVersionByNode: unexpected error: %v", err)
}
sv := bc.calcStakeVersion(node)
// Set stake versions.
node = newFakeNode(node, 3, sv, 0, time.Now())
@ -376,11 +358,7 @@ func TestCalcStakeVersionByNode(t *testing.T) {
bc.bestNode = node
}
version, err := bc.calcStakeVersionByNode(bc.bestNode)
if err != nil {
t.Fatalf("calcStakeVersionByNode: unexpected error: %v",
err)
}
version := bc.calcStakeVersion(bc.bestNode)
if version != test.expectVersion {
t.Fatalf("version mismatch: got %v expected %v",
version, test.expectVersion)
@ -727,10 +705,7 @@ func TestIsStakeMajorityVersion(t *testing.T) {
}
// validate calcStakeVersion
version, err := bc.calcStakeVersionByNode(node)
if err != nil {
t.Fatalf("calcStakeVersionByNode: unexpected error: %v", err)
}
version := bc.calcStakeVersion(node)
if version != test.expectedCalcVersion {
t.Fatalf("%v calcStakeVersionByNode got %v expected %v",
test.name, version, test.expectedCalcVersion)
@ -795,10 +770,7 @@ func TestLarge(t *testing.T) {
}
// validate calcStakeVersion
version, err := bc.calcStakeVersionByNode(node)
if err != nil {
t.Fatalf("calcStakeVersionByNode: unexpected error: %v", err)
}
version := bc.calcStakeVersion(node)
if version != test.expectedCalcVersion {
t.Fatalf("%v calcStakeVersionByNode got %v expected %v",
test.name, version, test.expectedCalcVersion)