Fix milestone no-ack parsing

maticnetwork · Jan 3, 2025 · 7fbf825 · 7fbf825
1 parent 14edef7
commit 7fbf825
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 15 deletions.
diff --git a/consensus/bor/heimdall/client.go b/consensus/bor/heimdall/client.go
@@ -85,7 +85,7 @@ const (
 	fetchMilestone      = "/milestone/latest"
 	fetchMilestoneCount = "/milestone/count"
 
-	fetchLastNoAckMilestone = "/milestone/lastNoAck"
+	fetchLastNoAckMilestone = "/milestone/last-no-ack"
 	fetchNoAckMilestone     = "/milestone/noAck/%s"
 	fetchMilestoneID        = "/milestone/ID/%s"
 
@@ -244,7 +244,7 @@ func (h *HeimdallClient) FetchLastNoAckMilestone(ctx context.Context) (string, e
 		return "", err
 	}
 
-	return response.Result.Result, nil
+	return response.Result, nil
 }
 
 // FetchNoAckMilestone fetches the last no-ack-milestone from heimdall
@@ -261,7 +261,7 @@ func (h *HeimdallClient) FetchNoAckMilestone(ctx context.Context, milestoneID st
 		return err
 	}
 
-	if !response.Result.Result {
+	if !response.Result {
 		return fmt.Errorf("%w: milestoneID %q", ErrNotInRejectedList, milestoneID)
 	}
 

diff --git a/consensus/bor/heimdall/milestone/milestone.go b/consensus/bor/heimdall/milestone/milestone.go
@@ -76,22 +76,12 @@ type MilestoneCountResponse struct {
 	Result MilestoneCount `json:"result"`
 }
 
-type MilestoneLastNoAck struct {
-	Result string `json:"result"`
-}
-
 type MilestoneLastNoAckResponse struct {
-	Height string             `json:"height"`
-	Result MilestoneLastNoAck `json:"result"`
-}
-
-type MilestoneNoAck struct {
-	Result bool `json:"result"`
+	Result string `json:"result"`
 }
 
 type MilestoneNoAckResponse struct {
-	Height string         `json:"height"`
-	Result MilestoneNoAck `json:"result"`
+	Result bool `json:"result"`
 }
 
 type MilestoneID struct {