Address PR comments
This commit is contained in:
parent
29f5c3ce86
commit
a3a6f97afb
@ -174,7 +174,6 @@ func NewBlockChain(db ethdb.Database, cacheConfig *CacheConfig, chainConfig *par
|
|||||||
bc.SetProcessor(NewStateProcessor(chainConfig, bc, engine))
|
bc.SetProcessor(NewStateProcessor(chainConfig, bc, engine))
|
||||||
|
|
||||||
var err error
|
var err error
|
||||||
|
|
||||||
bc.hc, err = NewHeaderChain(db, chainConfig, engine, bc.getProcInterrupt)
|
bc.hc, err = NewHeaderChain(db, chainConfig, engine, bc.getProcInterrupt)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
@ -1188,7 +1187,6 @@ func (bc *BlockChain) insertChain(chain types.Blocks) (int, []interface{}, []*ty
|
|||||||
parent = chain[i-1]
|
parent = chain[i-1]
|
||||||
}
|
}
|
||||||
state, err := state.New(parent.Root(), bc.stateCache)
|
state, err := state.New(parent.Root(), bc.stateCache)
|
||||||
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return i, events, coalescedLogs, err
|
return i, events, coalescedLogs, err
|
||||||
}
|
}
|
||||||
|
@ -34,11 +34,11 @@ type extractor struct {
|
|||||||
Publisher publisher.Publisher // Interface for publishing state diff objects to a datastore (e.g. IPFS)
|
Publisher publisher.Publisher // Interface for publishing state diff objects to a datastore (e.g. IPFS)
|
||||||
}
|
}
|
||||||
|
|
||||||
func NewExtractor(builder builder.Builder, publisher publisher.Publisher) (*extractor, error) {
|
func NewExtractor(builder builder.Builder, publisher publisher.Publisher) *extractor {
|
||||||
return &extractor{
|
return &extractor{
|
||||||
Builder: builder,
|
Builder: builder,
|
||||||
Publisher: publisher,
|
Publisher: publisher,
|
||||||
}, nil
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func (e *extractor) ExtractStateDiff(parent, current types.Block) (string, error) {
|
func (e *extractor) ExtractStateDiff(parent, current types.Block) (string, error) {
|
||||||
|
@ -23,7 +23,7 @@ var err error
|
|||||||
func TestExtractor(t *testing.T) {
|
func TestExtractor(t *testing.T) {
|
||||||
publisher = mocks.Publisher{}
|
publisher = mocks.Publisher{}
|
||||||
builder = mocks.Builder{}
|
builder = mocks.Builder{}
|
||||||
extractor, err = e.NewExtractor(&builder, &publisher)
|
extractor = e.NewExtractor(&builder, &publisher)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Error(err)
|
t.Error(err)
|
||||||
}
|
}
|
||||||
|
@ -31,10 +31,10 @@ func NewStateDiffService(db ethdb.Database, blockChain *core.BlockChain, config
|
|||||||
builder := b.NewBuilder(db)
|
builder := b.NewBuilder(db)
|
||||||
publisher, err := p.NewPublisher(config)
|
publisher, err := p.NewPublisher(config)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, nil
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
extractor, _ := e.NewExtractor(builder, publisher)
|
extractor := e.NewExtractor(builder, publisher)
|
||||||
return &StateDiffService{
|
return &StateDiffService{
|
||||||
BlockChain: blockChain,
|
BlockChain: blockChain,
|
||||||
Extractor: extractor,
|
Extractor: extractor,
|
||||||
|
Loading…
Reference in New Issue
Block a user