diff options
| author | zelig <viktor.tron@gmail.com> | 2014-12-15 04:57:29 +0800 |
|---|---|---|
| committer | zelig <viktor.tron@gmail.com> | 2014-12-15 04:57:29 +0800 |
| commit | 72290f67fee2be183981c9672d830040466187bd (patch) | |
| tree | a98e9720b169aec5484472945726a326d4b75631 /core | |
| parent | 4c89d5331f41fa93e6840893c6727b05eabe5f99 (diff) | |
| download | go-tangerine-72290f67fee2be183981c9672d830040466187bd.tar go-tangerine-72290f67fee2be183981c9672d830040466187bd.tar.gz go-tangerine-72290f67fee2be183981c9672d830040466187bd.tar.bz2 go-tangerine-72290f67fee2be183981c9672d830040466187bd.tar.lz go-tangerine-72290f67fee2be183981c9672d830040466187bd.tar.xz go-tangerine-72290f67fee2be183981c9672d830040466187bd.tar.zst go-tangerine-72290f67fee2be183981c9672d830040466187bd.zip | |
resolve merge conflict hell
Diffstat (limited to 'core')
| -rw-r--r-- | core/chain_manager.go | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/core/chain_manager.go b/core/chain_manager.go index 9ed2c1c42..f9fb3b3f8 100644 --- a/core/chain_manager.go +++ b/core/chain_manager.go @@ -137,10 +137,6 @@ func (bc *ChainManager) NewBlock(coinbase []byte) *types.Block { return block } -func (self *ChainManager) Status() (td *big.Int, currentBlock []byte, genesisBlock []byte) { - return self.TD, self.CurrentBlock.Hash(), self.Genesis().Hash() -} - func (bc *ChainManager) Reset() { AddTestNetFunds(bc.genesisBlock) |