@@ -69,9 +69,9 @@ type MergeCheckOptions struct {
69
69
}
70
70
71
71
type nodeMergeLog struct {
72
- Node * provider.Node
73
- Difficulty string
74
- BlockNumber int64
72
+ Node * provider.Node
73
+ TotalDifficulty string
74
+ BlockNumber int64
75
75
}
76
76
77
77
func (mc * MergeChecker ) Check (ctx context.Context , options MergeCheckOptions ) []string {
@@ -90,12 +90,12 @@ func (mc *MergeChecker) Check(ctx context.Context, options MergeCheckOptions) []
90
90
"appplicationPublicKey" : options .Session .Header .AppPublicKey ,
91
91
}
92
92
93
- if node .Difficulty != terminalTotalDifficulty || node .BlockNumber < mergeBlockNumber {
94
- logger .Log .WithFields (logData ).Warn (fmt .Sprintf ("MERGE CHECK FAILURE: %s difficulty: %s block number: %d" , publicKey , node .Difficulty , node .BlockNumber ))
93
+ if node .TotalDifficulty != terminalTotalDifficulty || node .BlockNumber < mergeBlockNumber {
94
+ logger .Log .WithFields (logData ).Warn (fmt .Sprintf ("MERGE CHECK FAILURE: %s difficulty: %s block number: %d" , publicKey , node .TotalDifficulty , node .BlockNumber ))
95
95
continue
96
96
}
97
97
98
- logger .Log .WithFields (logData ).Info (fmt .Sprintf ("MERGE CHECK SUCCES: %s difficulty: %s block number: %d" , publicKey , node .Difficulty , node .BlockNumber ))
98
+ logger .Log .WithFields (logData ).Info (fmt .Sprintf ("MERGE CHECK SUCCES: %s difficulty: %s block number: %d" , publicKey , node .TotalDifficulty , node .BlockNumber ))
99
99
100
100
mergedNodes = append (mergedNodes , publicKey )
101
101
}
@@ -168,8 +168,8 @@ func (mc *MergeChecker) getNodeMergeLog(ctx context.Context, node *provider.Node
168
168
}
169
169
170
170
nodeLogs <- & nodeMergeLog {
171
- Node : node ,
172
- Difficulty : relayResult .Result .Difficulty ,
173
- BlockNumber : blockNumber ,
171
+ Node : node ,
172
+ TotalDifficulty : relayResult .Result .TotalDifficulty ,
173
+ BlockNumber : blockNumber ,
174
174
}
175
175
}
0 commit comments