mirror of
https://github.com/ethereum/go-ethereum.git
synced 2026-07-26 06:36:43 +00:00
upstream: fixed consensus/*
This commit is contained in:
parent
747f6a914e
commit
e53660318e
3 changed files with 13 additions and 13 deletions
|
|
@ -80,7 +80,7 @@ func TestGenesisContractChange(t *testing.T) {
|
|||
b.Finalize(chain, h, statedb, &types.Body{Withdrawals: nil, Transactions: nil, Uncles: nil})
|
||||
|
||||
// write state to database
|
||||
root, err := statedb.Commit(0, false)
|
||||
root, err := statedb.Commit(0, false, true)
|
||||
require.NoError(t, err)
|
||||
require.NoError(t, statedb.Database().TrieDB().Commit(root, true))
|
||||
|
||||
|
|
|
|||
|
|
@ -346,7 +346,7 @@ func Fetch[T any](ctx context.Context, request *Request) (*T, error) {
|
|||
isSuccessful := false
|
||||
|
||||
defer func() {
|
||||
if metrics.Enabled {
|
||||
if metrics.Enabled() {
|
||||
sendMetrics(ctx, request.start, isSuccessful)
|
||||
}
|
||||
}()
|
||||
|
|
|
|||
|
|
@ -12,8 +12,8 @@ type (
|
|||
requestType string
|
||||
|
||||
meter struct {
|
||||
request map[bool]metrics.Meter // map[isSuccessful]metrics.Meter
|
||||
timer metrics.Timer
|
||||
request map[bool]*metrics.Meter // map[isSuccessful]metrics.Meter
|
||||
timer *metrics.Timer
|
||||
}
|
||||
)
|
||||
|
||||
|
|
@ -41,63 +41,63 @@ func getRequestType(ctx context.Context) (requestType, bool) {
|
|||
var (
|
||||
requestMeters = map[requestType]meter{
|
||||
stateSyncRequest: {
|
||||
request: map[bool]metrics.Meter{
|
||||
request: map[bool]*metrics.Meter{
|
||||
true: metrics.NewRegisteredMeter("client/requests/statesync/valid", nil),
|
||||
false: metrics.NewRegisteredMeter("client/requests/statesync/invalid", nil),
|
||||
},
|
||||
timer: metrics.NewRegisteredTimer("client/requests/statesync/duration", nil),
|
||||
},
|
||||
spanRequest: {
|
||||
request: map[bool]metrics.Meter{
|
||||
request: map[bool]*metrics.Meter{
|
||||
true: metrics.NewRegisteredMeter("client/requests/span/valid", nil),
|
||||
false: metrics.NewRegisteredMeter("client/requests/span/invalid", nil),
|
||||
},
|
||||
timer: metrics.NewRegisteredTimer("client/requests/span/duration", nil),
|
||||
},
|
||||
checkpointRequest: {
|
||||
request: map[bool]metrics.Meter{
|
||||
request: map[bool]*metrics.Meter{
|
||||
true: metrics.NewRegisteredMeter("client/requests/checkpoint/valid", nil),
|
||||
false: metrics.NewRegisteredMeter("client/requests/checkpoint/invalid", nil),
|
||||
},
|
||||
timer: metrics.NewRegisteredTimer("client/requests/checkpoint/duration", nil),
|
||||
},
|
||||
checkpointCountRequest: {
|
||||
request: map[bool]metrics.Meter{
|
||||
request: map[bool]*metrics.Meter{
|
||||
true: metrics.NewRegisteredMeter("client/requests/checkpointcount/valid", nil),
|
||||
false: metrics.NewRegisteredMeter("client/requests/checkpointcount/invalid", nil),
|
||||
},
|
||||
timer: metrics.NewRegisteredTimer("client/requests/checkpointcount/duration", nil),
|
||||
},
|
||||
milestoneRequest: {
|
||||
request: map[bool]metrics.Meter{
|
||||
request: map[bool]*metrics.Meter{
|
||||
true: metrics.NewRegisteredMeter("client/requests/milestone/valid", nil),
|
||||
false: metrics.NewRegisteredMeter("client/requests/milestone/invalid", nil),
|
||||
},
|
||||
timer: metrics.NewRegisteredTimer("client/requests/milestone/duration", nil),
|
||||
},
|
||||
milestoneCountRequest: {
|
||||
request: map[bool]metrics.Meter{
|
||||
request: map[bool]*metrics.Meter{
|
||||
true: metrics.NewRegisteredMeter("client/requests/milestonecount/valid", nil),
|
||||
false: metrics.NewRegisteredMeter("client/requests/milestonecount/invalid", nil),
|
||||
},
|
||||
timer: metrics.NewRegisteredTimer("client/requests/milestonecount/duration", nil),
|
||||
},
|
||||
milestoneNoAckRequest: {
|
||||
request: map[bool]metrics.Meter{
|
||||
request: map[bool]*metrics.Meter{
|
||||
true: metrics.NewRegisteredMeter("client/requests/milestonenoack/valid", nil),
|
||||
false: metrics.NewRegisteredMeter("client/requests/milestonenoack/invalid", nil),
|
||||
},
|
||||
timer: metrics.NewRegisteredTimer("client/requests/milestonenoack/duration", nil),
|
||||
},
|
||||
milestoneLastNoAckRequest: {
|
||||
request: map[bool]metrics.Meter{
|
||||
request: map[bool]*metrics.Meter{
|
||||
true: metrics.NewRegisteredMeter("client/requests/milestonelastnoack/valid", nil),
|
||||
false: metrics.NewRegisteredMeter("client/requests/milestonelastnoack/invalid", nil),
|
||||
},
|
||||
timer: metrics.NewRegisteredTimer("client/requests/milestonelastnoack/duration", nil),
|
||||
},
|
||||
milestoneIDRequest: {
|
||||
request: map[bool]metrics.Meter{
|
||||
request: map[bool]*metrics.Meter{
|
||||
true: metrics.NewRegisteredMeter("client/requests/milestoneid/valid", nil),
|
||||
false: metrics.NewRegisteredMeter("client/requests/milestoneid/invalid", nil),
|
||||
},
|
||||
|
|
|
|||
Loading…
Reference in a new issue