diff options
| author | Mission Liao <mission.liao@dexon.org> | 2019-02-22 17:01:42 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-22 17:01:42 +0800 |
| commit | 929d41761b72abab106b5a4d627701d1c232e891 (patch) | |
| tree | 2683f07d02b1d72231810ec12963b51c562165a2 /core/utils | |
| parent | 8ef4fc213703620fbfa13890dee042d40eea8545 (diff) | |
| download | tangerine-consensus-929d41761b72abab106b5a4d627701d1c232e891.tar tangerine-consensus-929d41761b72abab106b5a4d627701d1c232e891.tar.gz tangerine-consensus-929d41761b72abab106b5a4d627701d1c232e891.tar.bz2 tangerine-consensus-929d41761b72abab106b5a4d627701d1c232e891.tar.lz tangerine-consensus-929d41761b72abab106b5a4d627701d1c232e891.tar.xz tangerine-consensus-929d41761b72abab106b5a4d627701d1c232e891.tar.zst tangerine-consensus-929d41761b72abab106b5a4d627701d1c232e891.zip | |
core: remove acks (#451)
Diffstat (limited to 'core/utils')
| -rw-r--r-- | core/utils/crypto.go | 7 | ||||
| -rw-r--r-- | core/utils/crypto_test.go | 8 |
2 files changed, 0 insertions, 15 deletions
diff --git a/core/utils/crypto.go b/core/utils/crypto.go index fe67a95..f5343ca 100644 --- a/core/utils/crypto.go +++ b/core/utils/crypto.go @@ -37,12 +37,6 @@ func hashWitness(witness *types.Witness) (common.Hash, error) { // HashBlock generates hash of a types.Block. func HashBlock(block *types.Block) (common.Hash, error) { hashPosition := hashPosition(block.Position) - // Handling Block.Acks. - binaryAcks := make([][]byte, len(block.Acks)) - for idx, ack := range block.Acks { - binaryAcks[idx] = ack[:] - } - hashAcks := crypto.Keccak256Hash(binaryAcks...) binaryTimestamp, err := block.Timestamp.UTC().MarshalBinary() if err != nil { return common.Hash{}, err @@ -56,7 +50,6 @@ func HashBlock(block *types.Block) (common.Hash, error) { block.ProposerID.Hash[:], block.ParentHash[:], hashPosition[:], - hashAcks[:], binaryTimestamp[:], block.PayloadHash[:], binaryWitness[:]) diff --git a/core/utils/crypto_test.go b/core/utils/crypto_test.go index f1fa9b6..1077277 100644 --- a/core/utils/crypto_test.go +++ b/core/utils/crypto_test.go @@ -37,11 +37,9 @@ type CryptoTestSuite struct { var myNID = types.NodeID{Hash: common.NewRandomHash()} func (s *CryptoTestSuite) prepareBlock(prevBlock *types.Block) *types.Block { - acks := common.Hashes{} now := time.Now().UTC() if prevBlock == nil { return &types.Block{ - Acks: common.NewSortedHashes(acks), Timestamp: now, Finalization: types.FinalizationResult{ Timestamp: time.Now(), @@ -52,7 +50,6 @@ func (s *CryptoTestSuite) prepareBlock(prevBlock *types.Block) *types.Block { s.Require().NotEqual(prevBlock.Hash, common.Hash{}) return &types.Block{ ParentHash: prevBlock.Hash, - Acks: common.NewSortedHashes(acks), Timestamp: now, Position: types.Position{ Height: prevBlock.Position.Height + 1, @@ -116,11 +113,6 @@ func (s *CryptoTestSuite) TestBlockSignature() { } s.NoError(VerifyBlockSignature(block)) } - // Modify Block.Acks and verify signature again. - for _, block := range blocks { - block.Acks = append(block.Acks, common.NewRandomHash()) - s.Error(VerifyBlockSignature(block)) - } } func (s *CryptoTestSuite) TestVoteSignature() { |