From a69ee0b441309b3e9601f79e6f8f45fe6fd37b44 Mon Sep 17 00:00:00 2001 From: Ian Norden Date: Fri, 14 Aug 2020 14:35:08 -0500 Subject: [PATCH] fix mock blockchain; golint; bump patch --- core/blockchain.go | 4 +--- params/version.go | 2 +- statediff/testhelpers/mocks/blockchain.go | 2 ++ 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/core/blockchain.go b/core/blockchain.go index bd17cf5b7e84..020426f4fdfa 100644 --- a/core/blockchain.go +++ b/core/blockchain.go @@ -43,7 +43,7 @@ import ( "github.com/ethereum/go-ethereum/params" "github.com/ethereum/go-ethereum/rlp" "github.com/ethereum/go-ethereum/trie" - "github.com/hashicorp/golang-lru" + lru "github.com/hashicorp/golang-lru" ) var ( @@ -2288,7 +2288,6 @@ func (bc *BlockChain) LockTrie(root common.Hash) { bc.trieLock.Lock() bc.lockedRoots[root] = true bc.trieLock.Unlock() - return } // UnlockTrie allows dereferencing of the provided root- provided it was previously locked @@ -2296,5 +2295,4 @@ func (bc *BlockChain) UnlockTrie(root common.Hash) { bc.trieLock.Lock() bc.lockedRoots[root] = false bc.trieLock.Unlock() - return } diff --git a/params/version.go b/params/version.go index fed27e83b3a5..4cb03550efa6 100644 --- a/params/version.go +++ b/params/version.go @@ -24,7 +24,7 @@ const ( VersionMajor = 1 // Major version component of the current release VersionMinor = 9 // Minor version component of the current release VersionPatch = 11 // Patch version component of the current release - VersionMeta = "statediff-0.0.3" // Version metadata to append to the version string + VersionMeta = "statediff-0.0.4" // Version metadata to append to the version string ) // Version holds the textual version string. diff --git a/statediff/testhelpers/mocks/blockchain.go b/statediff/testhelpers/mocks/blockchain.go index 1559a78347de..a995e47c6d91 100644 --- a/statediff/testhelpers/mocks/blockchain.go +++ b/statediff/testhelpers/mocks/blockchain.go @@ -124,3 +124,5 @@ func (blockChain *BlockChain) SetTdByHash(hash common.Hash, td *big.Int) { } blockChain.TDByHash[hash] = td } + +func (blockChain *BlockChain) UnlockTrie(root common.Hash) {}