Use stateutil.BlockRoot everywhere (#5739)

* Sweeping replace of ssz.HashTreeRoot(block) to stateutil.BlockRoot, minor tweaks to critical path of proposeBlock
* imports
* Merge branch 'master' into better-block-htr
* Add --enable-custom-block-htr to e2e flags
* Merge branch 'better-block-htr' of github.com:prysmaticlabs/prysm into better-block-htr
This commit is contained in:
Preston Van Loon
2020-05-04 21:30:24 -07:00
committed by GitHub
parent 4958c0372c
commit 9be8a456eb
72 changed files with 310 additions and 276 deletions

View File

@@ -16,11 +16,11 @@ import (
"strconv"
"github.com/emicklei/dot"
"github.com/prysmaticlabs/go-ssz"
"github.com/prysmaticlabs/prysm/beacon-chain/cache"
"github.com/prysmaticlabs/prysm/beacon-chain/core/helpers"
"github.com/prysmaticlabs/prysm/beacon-chain/db"
"github.com/prysmaticlabs/prysm/beacon-chain/db/filters"
"github.com/prysmaticlabs/prysm/beacon-chain/state/stateutil"
"github.com/prysmaticlabs/prysm/shared/attestationutil"
"github.com/prysmaticlabs/prysm/shared/bytesutil"
)
@@ -62,7 +62,7 @@ func main() {
m := make(map[[32]byte]*node)
for i := 0; i < len(blks); i++ {
b := blks[i]
r, err := ssz.HashTreeRoot(b.Block)
r, err := stateutil.BlockRoot(b.Block)
if err != nil {
panic(err)
}
@@ -83,7 +83,7 @@ func main() {
if err != nil {
panic(err)
}
rs, err := ssz.HashTreeRoot(bs[0].Block)
rs, err := stateutil.BlockRoot(bs[0].Block)
if err != nil {
panic(err)
}