mirror of
https://github.com/ethereum/go-ethereum.git
synced 2026-07-25 06:06:44 +00:00
FIX: Removed unused parameter spanID
This commit is contained in:
parent
43c0685ac6
commit
8a15a42015
4 changed files with 3 additions and 4 deletions
|
|
@ -93,7 +93,7 @@ func (gc *GenesisContractsClient) CommitState(
|
||||||
|
|
||||||
log.Info("→ committing new state", "eventRecord", event.ID)
|
log.Info("→ committing new state", "eventRecord", event.ID)
|
||||||
|
|
||||||
gasUsed, err := statefull.ApplyMessage(context.Background(), msg, state, header, gc.chainConfig, chCtx, 0, tracer)
|
gasUsed, err := statefull.ApplyMessage(context.Background(), msg, state, header, gc.chainConfig, chCtx, tracer)
|
||||||
|
|
||||||
// Logging event log with time and individual gasUsed
|
// Logging event log with time and individual gasUsed
|
||||||
log.Info("→ committed new state", "eventRecord", event.String(gasUsed))
|
log.Info("→ committed new state", "eventRecord", event.String(gasUsed))
|
||||||
|
|
|
||||||
|
|
@ -336,7 +336,7 @@ func (c *ChainSpanner) CommitSpan(ctx context.Context, heimdallSpan HeimdallSpan
|
||||||
msg := statefull.GetSystemMessage(c.validatorContractAddress, data)
|
msg := statefull.GetSystemMessage(c.validatorContractAddress, data)
|
||||||
|
|
||||||
// apply message
|
// apply message
|
||||||
_, err = statefull.ApplyMessage(ctx, msg, state, header, c.chainConfig, chainContext, 0, tracer)
|
_, err = statefull.ApplyMessage(ctx, msg, state, header, c.chainConfig, chainContext, tracer)
|
||||||
|
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -71,7 +71,6 @@ func ApplyMessage(
|
||||||
header *types.Header,
|
header *types.Header,
|
||||||
chainConfig *params.ChainConfig,
|
chainConfig *params.ChainConfig,
|
||||||
chainContext core.ChainContext,
|
chainContext core.ChainContext,
|
||||||
spanID int64,
|
|
||||||
tracer *tracing.Hooks,
|
tracer *tracing.Hooks,
|
||||||
) (uint64, error) {
|
) (uint64, error) {
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -711,7 +711,7 @@ func (api *API) IntermediateRoots(ctx context.Context, hash common.Hash, config
|
||||||
if *config.BorTraceEnabled {
|
if *config.BorTraceEnabled {
|
||||||
callmsg := prepareCallMessage(*msg)
|
callmsg := prepareCallMessage(*msg)
|
||||||
statedb.SetTxContext(stateSyncHash, i)
|
statedb.SetTxContext(stateSyncHash, i)
|
||||||
if _, err := statefull.ApplyMessage(ctx, callmsg, statedb, block.Header(), api.backend.ChainConfig(), api.chainContext(ctx), 0, nil); err != nil {
|
if _, err := statefull.ApplyMessage(ctx, callmsg, statedb, block.Header(), api.backend.ChainConfig(), api.chainContext(ctx), nil); err != nil {
|
||||||
log.Warn("Tracing intermediate roots did not complete", "txindex", i, "txhash", stateSyncHash, "err", err)
|
log.Warn("Tracing intermediate roots did not complete", "txindex", i, "txhash", stateSyncHash, "err", err)
|
||||||
// We intentionally don't return the error here: if we do, then the RPC server will not
|
// We intentionally don't return the error here: if we do, then the RPC server will not
|
||||||
// return the roots. Most likely, the caller already knows that a certain transaction fails to
|
// return the roots. Most likely, the caller already knows that a certain transaction fails to
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue