diff options
| author | obscuren <geffobscura@gmail.com> | 2014-10-31 19:37:43 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2014-10-31 19:37:43 +0800 |
| commit | fd9da72536b73351bbcdc1e9dbbbb8c0e4bfb21b (patch) | |
| tree | 5f60296ff025ec08962cdd2b4f6bbcfd1479cfdb /chain/block.go | |
| parent | 3ee0461cb5b6e4a5e2d287180afbdb681805a662 (diff) | |
| download | dexon-fd9da72536b73351bbcdc1e9dbbbb8c0e4bfb21b.tar dexon-fd9da72536b73351bbcdc1e9dbbbb8c0e4bfb21b.tar.gz dexon-fd9da72536b73351bbcdc1e9dbbbb8c0e4bfb21b.tar.bz2 dexon-fd9da72536b73351bbcdc1e9dbbbb8c0e4bfb21b.tar.lz dexon-fd9da72536b73351bbcdc1e9dbbbb8c0e4bfb21b.tar.xz dexon-fd9da72536b73351bbcdc1e9dbbbb8c0e4bfb21b.tar.zst dexon-fd9da72536b73351bbcdc1e9dbbbb8c0e4bfb21b.zip | |
ethcrypto => crypto
Diffstat (limited to 'chain/block.go')
| -rw-r--r-- | chain/block.go | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/chain/block.go b/chain/block.go index 17a19d391..abad6f3d2 100644 --- a/chain/block.go +++ b/chain/block.go @@ -7,7 +7,7 @@ import ( "sort" "time" - "github.com/ethereum/go-ethereum/ethcrypto" + "github.com/ethereum/go-ethereum/crypto" "github.com/ethereum/go-ethereum/ethstate" "github.com/ethereum/go-ethereum/ethtrie" "github.com/ethereum/go-ethereum/ethutil" @@ -144,12 +144,12 @@ func CreateBlock(root interface{}, // Returns a hash of the block func (block *Block) Hash() ethutil.Bytes { - return ethcrypto.Sha3(ethutil.NewValue(block.header()).Encode()) - //return ethcrypto.Sha3(block.Value().Encode()) + return crypto.Sha3(ethutil.NewValue(block.header()).Encode()) + //return crypto.Sha3(block.Value().Encode()) } func (block *Block) HashNoNonce() []byte { - return ethcrypto.Sha3(ethutil.Encode(block.miningHeader())) + return crypto.Sha3(ethutil.Encode(block.miningHeader())) } func (block *Block) State() *ethstate.State { @@ -232,7 +232,7 @@ func (block *Block) rlpUncles() interface{} { func (block *Block) SetUncles(uncles []*Block) { block.Uncles = uncles - block.UncleSha = ethcrypto.Sha3(ethutil.Encode(block.rlpUncles())) + block.UncleSha = crypto.Sha3(ethutil.Encode(block.rlpUncles())) } func (self *Block) SetReceipts(receipts Receipts) { |