cerc-io/eth-statediff-service
10
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

proper fail for worker count

Browse Source
This commit is contained in:
Roy Crihfield 2020-09-15 01:03:46 -05:00
parent d711fa7d7f
commit 03018fa58a
3 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/builder.go
View File

@ -23,6 +23,7 @@ import (
"bytes" "bytes"
"fmt" "fmt"
"sync" "sync"
"math/bits"
"github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/core/state" "github.com/ethereum/go-ethereum/core/state"
@ -58,14 +59,17 @@ type iterPair struct {
} }
// NewBuilder is used to create a statediff builder // NewBuilder is used to create a statediff builder
func NewBuilder(stateCache state.Database, workers uint) Builder { func NewBuilder(stateCache state.Database, workers uint) (Builder, error) {
if workers == 0 { if workers == 0 {
workers = 1 workers = 1
} }
if bits.OnesCount(workers) != 1 {
return nil, fmt.Errorf("workers must be a power of 2")
}
return &builder{ return &builder{
stateCache: stateCache, // state cache is safe for concurrent reads stateCache: stateCache, // state cache is safe for concurrent reads
numWorkers: workers, numWorkers: workers,
} }, nil
} }
// BuildStateTrieObject builds a state trie object from the provided block // BuildStateTrieObject builds a state trie object from the provided block

16
pkg/builder_test.go
View File

@ -669,7 +669,7 @@ func TestBuilder(t *testing.T) {
} }
for _, workers := range workerCounts { for _, workers := range workerCounts {
builder := pkg.NewBuilder(chain.StateCache(), workers) builder, _ = pkg.NewBuilder(chain.StateCache(), workers)
for _, test := range tests { for _, test := range tests {
diff, err := builder.BuildStateDiffObject(test.startingArguments, params) diff, err := builder.BuildStateDiffObject(test.startingArguments, params)
if err != nil { if err != nil {
@ -928,7 +928,7 @@ func TestBuilderWithIntermediateNodes(t *testing.T) {
} }
for _, workers := range workerCounts { for _, workers := range workerCounts {
builder = pkg.NewBuilder(chain.StateCache(), workers) builder, _ = pkg.NewBuilder(chain.StateCache(), workers)
for i, test := range tests { for i, test := range tests {
diff, err := builder.BuildStateDiffObject(test.startingArguments, params) diff, err := builder.BuildStateDiffObject(test.startingArguments, params)
if err != nil { if err != nil {
@ -1113,7 +1113,7 @@ func TestBuilderWithWatchedAddressList(t *testing.T) {
} }
for _, workers := range workerCounts { for _, workers := range workerCounts {
builder = pkg.NewBuilder(chain.StateCache(), workers) builder, _ = pkg.NewBuilder(chain.StateCache(), workers)
for _, test := range tests { for _, test := range tests {
diff, err := builder.BuildStateDiffObject(test.startingArguments, params) diff, err := builder.BuildStateDiffObject(test.startingArguments, params)
if err != nil { if err != nil {
@ -1272,7 +1272,7 @@ func TestBuilderWithWatchedAddressAndStorageKeyList(t *testing.T) {
} }
for _, workers := range workerCounts { for _, workers := range workerCounts {
builder = pkg.NewBuilder(chain.StateCache(), workers) builder, _ = pkg.NewBuilder(chain.StateCache(), workers)
for _, test := range tests { for _, test := range tests {
diff, err := builder.BuildStateDiffObject(test.startingArguments, params) diff, err := builder.BuildStateDiffObject(test.startingArguments, params)
if err != nil { if err != nil {
@ -1481,7 +1481,7 @@ func TestBuilderWithRemovedAccountAndStorage(t *testing.T) {
} }
for _, workers := range workerCounts { for _, workers := range workerCounts {
builder = pkg.NewBuilder(chain.StateCache(), workers) builder, _ = pkg.NewBuilder(chain.StateCache(), workers)
for _, test := range tests { for _, test := range tests {
diff, err := builder.BuildStateDiffObject(test.startingArguments, params) diff, err := builder.BuildStateDiffObject(test.startingArguments, params)
if err != nil { if err != nil {
@ -1667,7 +1667,7 @@ func TestBuilderWithRemovedAccountAndStorageWithoutIntermediateNodes(t *testing.
} }
for _, workers := range workerCounts { for _, workers := range workerCounts {
builder = pkg.NewBuilder(chain.StateCache(), workers) builder, _ = pkg.NewBuilder(chain.StateCache(), workers)
for _, test := range tests { for _, test := range tests {
diff, err := builder.BuildStateDiffObject(test.startingArguments, params) diff, err := builder.BuildStateDiffObject(test.startingArguments, params)
if err != nil { if err != nil {
@ -1877,7 +1877,7 @@ func TestBuilderWithMovedAccount(t *testing.T) {
} }
for _, workers := range workerCounts { for _, workers := range workerCounts {
builder = pkg.NewBuilder(chain.StateCache(), workers) builder, _ = pkg.NewBuilder(chain.StateCache(), workers)
for _, test := range tests { for _, test := range tests {
diff, err := builder.BuildStateDiffObject(test.startingArguments, params) diff, err := builder.BuildStateDiffObject(test.startingArguments, params)
if err != nil { if err != nil {
@ -1995,7 +1995,7 @@ func TestBuilderWithMovedAccountOnlyLeafs(t *testing.T) {
} }
for _, workers := range workerCounts { for _, workers := range workerCounts {
builder = pkg.NewBuilder(chain.StateCache(), workers) builder, _ = pkg.NewBuilder(chain.StateCache(), workers)
for _, test := range tests { for _, test := range tests {
diff, err := builder.BuildStateDiffObject(test.startingArguments, params) diff, err := builder.BuildStateDiffObject(test.startingArguments, params)
if err != nil { if err != nil {

6
pkg/service.go
View File

@ -71,9 +71,13 @@ type Service struct {
// NewStateDiffService creates a new Service // NewStateDiffService creates a new Service
func NewStateDiffService(lvlDBReader lvlDBReader, cfg Config) (*Service, error) { func NewStateDiffService(lvlDBReader lvlDBReader, cfg Config) (*Service, error) {
builder, err := NewBuilder(lvlDBReader.StateDB(), cfg.Workers)
if err != nil {
return nil, err
}
return &Service{ return &Service{
lvlDBReader: lvlDBReader, lvlDBReader: lvlDBReader,
Builder: NewBuilder(lvlDBReader.StateDB(), cfg.Workers), Builder: builder,
QuitChan: make(chan bool), QuitChan: make(chan bool),
}, nil }, nil
} }