Address PR comments

This commit is contained in:
Elizabeth Engelman 2019-01-15 15:51:15 -06:00
parent 29f5c3ce86
commit a3a6f97afb
4 changed files with 5 additions and 7 deletions

View File

@ -174,7 +174,6 @@ func NewBlockChain(db ethdb.Database, cacheConfig *CacheConfig, chainConfig *par
bc.SetProcessor(NewStateProcessor(chainConfig, bc, engine))
var err error
bc.hc, err = NewHeaderChain(db, chainConfig, engine, bc.getProcInterrupt)
if err != nil {
return nil, err
@ -1188,7 +1187,6 @@ func (bc *BlockChain) insertChain(chain types.Blocks) (int, []interface{}, []*ty
parent = chain[i-1]
}
state, err := state.New(parent.Root(), bc.stateCache)
if err != nil {
return i, events, coalescedLogs, err
}

View File

@ -34,11 +34,11 @@ type extractor struct {
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{
Builder: builder,
Publisher: publisher,
}, nil
}
}
func (e *extractor) ExtractStateDiff(parent, current types.Block) (string, error) {

View File

@ -23,7 +23,7 @@ var err error
func TestExtractor(t *testing.T) {
publisher = mocks.Publisher{}
builder = mocks.Builder{}
extractor, err = e.NewExtractor(&builder, &publisher)
extractor = e.NewExtractor(&builder, &publisher)
if err != nil {
t.Error(err)
}

View File

@ -31,10 +31,10 @@ func NewStateDiffService(db ethdb.Database, blockChain *core.BlockChain, config
builder := b.NewBuilder(db)
publisher, err := p.NewPublisher(config)
if err != nil {
return nil, nil
return nil, err
}
extractor, _ := e.NewExtractor(builder, publisher)
extractor := e.NewExtractor(builder, publisher)
return &StateDiffService{
BlockChain: blockChain,
Extractor: extractor,