cerc-io/go-ethereum
18
0
Fork 0
Code Issues 9 Pull Requests Packages Projects Releases 66 Wiki Activity

review fixes and fixes for issues ran into in integration

Browse Source
This commit is contained in:
Ian Norden 2019-05-17 10:20:28 -05:00 committed by Rob Mulholand
parent 5fa40688af
commit 65e9874da3
5 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/geth/main.go
View File

@ -150,7 +150,7 @@ var (
utils.EVMInterpreterFlag,
utils.StateDiffFlag,
utils.StateDiffPathsAndProofs,
utils.StateDiffAllNodeTypes,
utils.StateDiffIntermediateNodes,
utils.StateDiffStreamBlock,
utils.StateDiffWatchedAddresses,
configFileFlag,

2
cmd/geth/usage.go
View File

@ -267,7 +267,7 @@ var AppHelpFlagGroups = []flagGroup{
Flags: []cli.Flag{
utils.StateDiffFlag,
utils.StateDiffPathsAndProofs,
utils.StateDiffAllNodeTypes,
utils.StateDiffIntermediateNodes,
utils.StateDiffWatchedAddresses,
utils.StateDiffStreamBlock,
},

12
cmd/utils/flags.go
View File

@ -765,11 +765,11 @@ var (
}
StateDiffPathsAndProofs = cli.BoolFlag{
Name: "statediff.pathsandproofs",
Usage: "Set to true to generate paths and proof sets for diffed state and storage trie lead nodes",
Usage: "Set to true to generate paths and proof sets for diffed state and storage trie leaf nodes",
}
StateDiffAllNodeTypes = cli.BoolFlag{
Name: "statediff.allnodes",
Usage: "Set to true to consider all node types: leaf, branch, and extension; default (false) processes leaf nodes only",
StateDiffIntermediateNodes = cli.BoolFlag{
Name: "statediff.intermediatenodes",
Usage: "Set to include intermediate (branch and extension) nodes; default (false) processes leaf nodes only",
}
StateDiffWatchedAddresses = cli.StringSliceFlag{
Name: "statediff.watchedaddresses",
@ -777,7 +777,7 @@ var (
}
StateDiffStreamBlock = cli.BoolFlag{
Name: "statediff.streamblock",
Usage: "Set to true to stream the block data alongside state diff data",
Usage: "Set to true to stream the block data alongside state diff data in the same subscription payload",
}
)
@ -1642,7 +1642,7 @@ func RegisterStateDiffService(stack *node.Node, ctx *cli.Context) {
config := statediff.Config{
StreamBlock: ctx.GlobalBool(StateDiffStreamBlock.Name),
PathsAndProofs: ctx.GlobalBool(StateDiffPathsAndProofs.Name),
AllNodes: ctx.GlobalBool(StateDiffAllNodeTypes.Name),
AllNodes: ctx.GlobalBool(StateDiffIntermediateNodes.Name),
WatchedAddresses: ctx.GlobalStringSlice(StateDiffWatchedAddresses.Name),
}
if err := stack.Register(func(ctx *node.ServiceContext) (node.Service, error) {

14
statediff/api.go
View File

@ -44,7 +44,7 @@ func NewPublicStateDiffAPI(sds IService) *PublicStateDiffAPI {
}
// Subscribe is the public method to setup a subscription that fires off state-diff payloads as they are created
func (api *PublicStateDiffAPI) Subscribe(ctx context.Context) (*rpc.Subscription, error) {
func (api *PublicStateDiffAPI) Subscribe(ctx context.Context, payloadChan chan Payload) (*rpc.Subscription, error) {
// ensure that the RPC connection supports subscriptions
notifier, supported := rpc.NotifierFromContext(ctx)
if !supported {
@ -56,19 +56,21 @@ func (api *PublicStateDiffAPI) Subscribe(ctx context.Context) (*rpc.Subscription
go func() {
// subscribe to events from the state diff service
payloadChannel := make(chan Payload)
payloadChannel := make(chan Payload, 10)
quitChan := make(chan bool)
api.sds.Subscribe(rpcSub.ID, payloadChannel, quitChan)
// loop and await state diff payloads and relay them to the subscriber with then notifier
// loop and await state diff payloads and relay them to the subscriber with the notifier
for {
select {
case packet := <-payloadChannel:
if err := notifier.Notify(rpcSub.ID, packet); err != nil {
log.Error("Failed to send state diff packet", "err", err)
}
case <-rpcSub.Err():
err := api.sds.Unsubscribe(rpcSub.ID)
case err := <-rpcSub.Err():
log.Error("State diff service rpcSub error", err)
println("err")
println(err.Error())
err = api.sds.Unsubscribe(rpcSub.ID)
if err != nil {
log.Error("Failed to unsubscribe from the state diff service", err)
}

12
statediff/service.go
View File

@ -129,11 +129,11 @@ func (sds *Service) Loop(chainEventCh chan core.ChainEvent) {
log.Error("Error building statediff", "block number", currentBlock.Number(), "error", err)
}
case err := <-errCh:
log.Warn("Error from chain event subscription, breaking loop.", "error", err)
log.Warn("Error from chain event subscription, breaking loop", "error", err)
sds.close()
return
case <-sds.QuitChan:
log.Info("Quitting the statediff block channel")
log.Info("Quitting the statediffing process")
sds.close()
return
}
@ -214,9 +214,9 @@ func (sds *Service) send(payload Payload) {
for id, sub := range sds.Subscriptions {
select {
case sub.PayloadChan <- payload:
log.Info("sending state diff payload to subscription %s", id)
log.Info(fmt.Sprintf("sending state diff payload to subscription %s", id))
default:
log.Info("unable to send payload to subscription %s; channel has no receiver", id)
log.Info(fmt.Sprintf("unable to send payload to subscription %s", id))
}
}
sds.Unlock()
@ -229,9 +229,9 @@ func (sds *Service) close() {
select {
case sub.QuitChan <- true:
delete(sds.Subscriptions, id)
log.Info("closing subscription %s", id)
log.Info(fmt.Sprintf("closing subscription %s", id))
default:
log.Info("unable to close subscription %s; channel has no receiver", id)
log.Info(fmt.Sprintf("unable to close subscription %s; channel has no receiver", id))
}
}
sds.Unlock()