rename confirmatino to minimal block info

Signed-off-by: Chengxuan Xing <[email protected]>

Author: Chengxuan

pkg/ffcapi/api.go

@@ -97,33 +97,33 @@ type API interface {
 
 type ConfirmationMapUpdateResult struct {
 	*ConfirmationMap
-	HasNewFork              bool `json:"hasNewFork,omitempty"`         // when set to true, it means a fork is detected based on the existing confirmations
-	Rebuilt                 bool `json:"rebuilt,omitempty"`            // when set to true, it means all of the existing confirmations are discarded
-	HasNewConfirmation      bool `json:"hasNewConfirmation,omitempty"` // when set to true, it means new blocks from canonical chain are added to the confirmation queue
-	Confirmed               bool `json:"confirmed,omitempty"`          // when set to true, it means the confirmation queue is complete and all the blocks are confirmed
-	TargetConfirmationCount int  `json:"targetConfirmationCount"`      // the target number of confirmations for this event
+	HasNewFork              bool             `json:"hasNewFork,omitempty"`         // when set to true, it means a fork is detected based on the existing confirmations
+	Rebuilt                 bool             `json:"rebuilt,omitempty"`            // when set to true, it means all of the existing confirmations are discarded
+	HasNewConfirmation      bool             `json:"hasNewConfirmation,omitempty"` // when set to true, it means new blocks from canonical chain are added to the confirmation queue
+	Confirmed               bool             `json:"confirmed,omitempty"`          // when set to true, it means the confirmation queue is complete and all the blocks are confirmed
+	TargetConfirmationCount fftypes.FFuint64 `json:"targetConfirmationCount"`      // the target number of confirmations for this event
 }
 
 type ConfirmationMap struct {
 	// confirmation map is contains a list of possible confirmations for a transaction
 	// the key is the hash of the first block that contains the transaction hash
 	// the first block is the block that contains the transaction hash
-	ConfirmationQueueMap map[string][]*Confirmation `json:"confirmationQueueMap,omitempty"`
+	ConfirmationQueueMap map[string][]*MinimalBlockInfo `json:"confirmationQueueMap,omitempty"`
 	// which block hash that leads a confirmation queue matches the canonical block hash
 	CanonicalBlockHash string `json:"canonicalBlockHash,omitempty"`
 }
 
-type Confirmation struct { // duplicate of apitypes.Confirmation due to circular dependency
+type MinimalBlockInfo struct { // duplicate of apitypes.Confirmation due to circular dependency
 	BlockNumber fftypes.FFuint64 `json:"blockNumber"`
 	BlockHash   string           `json:"blockHash"`
 	ParentHash  string           `json:"parentHash"`
 }
 
-func (c *Confirmation) Equal(other *Confirmation) bool {
+func (c *MinimalBlockInfo) Equal(other *MinimalBlockInfo) bool {
 	return c.BlockNumber == other.BlockNumber && c.BlockHash == other.BlockHash && c.ParentHash == other.ParentHash
 }
 
-func (c *Confirmation) IsParentOf(other *Confirmation) bool {
+func (c *MinimalBlockInfo) IsParentOf(other *MinimalBlockInfo) bool {
 	return c.BlockHash == other.ParentHash && c.BlockNumber+1 == other.BlockNumber
 }
 

pkg/fftm/transaction_management_test.go

@@ -35,15 +35,15 @@ func TestReconcileConfirmationsForTransaction(t *testing.T) {
 	mFFC := m.connector.(*ffcapimocks.API)
 
 	mFFC.On("ReconcileConfirmationsForTransaction", m.ctx, "0x1234567890", &ffcapi.ConfirmationMap{
-		ConfirmationQueueMap: make(map[string][]*ffcapi.Confirmation),
+		ConfirmationQueueMap: make(map[string][]*ffcapi.MinimalBlockInfo),
 	}, 1).Return(&ffcapi.ConfirmationMapUpdateResult{
 		ConfirmationMap: &ffcapi.ConfirmationMap{
-			ConfirmationQueueMap: make(map[string][]*ffcapi.Confirmation),
+			ConfirmationQueueMap: make(map[string][]*ffcapi.MinimalBlockInfo),
 		},
 	}, nil)
 
 	_, err := m.ReconcileConfirmationsForTransaction(m.ctx, "0x1234567890", &ffcapi.ConfirmationMap{
-		ConfirmationQueueMap: make(map[string][]*ffcapi.Confirmation),
+		ConfirmationQueueMap: make(map[string][]*ffcapi.MinimalBlockInfo),
 	}, 1)
 	assert.NoError(t, err)
 }