Merge pull request #804 from pastelnetwork/PSL-1133_removeRQSymbols

[PSL-1533] remove rq symbols from self-healing messages

Author: j-rafique

common/types/self_healing.go

@@ -129,8 +129,6 @@ type RespondedTicket struct {
 	TicketType               TicketType `json:"ticket_type"`
 	MissingKeys              []string   `json:"missing_keys"`
 	ReconstructedFileHash    []byte     `json:"reconstructed_file_hash"`
-	FileIDs                  []string   `json:"sense_file_ids"`
-	RaptorQSymbols           []byte     `json:"raptor_q_symbols"`
 	IsReconstructionRequired bool       `json:"is_reconstruction_required"`
 	Error                    string     `json:"error"`
 }
@@ -153,8 +151,6 @@ type VerifiedTicket struct {
 	ReconstructedFileHash            []byte     `json:"reconstructed_file_hash"`
 	IsReconstructionRequired         bool       `json:"is_reconstruction_required"`
 	IsReconstructionRequiredByHealer bool       `json:"is_reconstruction_required_by_healer"`
-	RaptorQSymbols                   []byte     `json:"raptor_q_symbols"`
-	FileIDs                          []string   `json:"sense_file_ids"`
 	IsVerified                       bool       `json:"is_verified"`
 	Message                          string     `json:"message"`
 }

supernode/services/selfhealing/process_self_healing_challenge.go

@@ -89,7 +89,6 @@ func (task *SHTask) ProcessSelfHealingChallenge(ctx context.Context, event types
 				TicketType:               ticket.TicketType,
 				MissingKeys:              ticket.MissingKeys,
 				ReconstructedFileHash:    nil,
-				RaptorQSymbols:           nil,
 				IsReconstructionRequired: false,
 			}
 			logger.Info("sending response for verification")
@@ -125,7 +124,6 @@ func (task *SHTask) ProcessSelfHealingChallenge(ctx context.Context, event types
 			TicketType:               ticket.TicketType,
 			MissingKeys:              ticket.MissingKeys,
 			ReconstructedFileHash:    reconstructedFileHash,
-			RaptorQSymbols:           raptorQSymbols,
 			IsReconstructionRequired: true,
 		}
 		logger.Info("sending response for verification")
@@ -192,8 +190,6 @@ func (task *SHTask) ProcessSelfHealingChallenge(ctx context.Context, event types
 				TicketType:               ticket.TicketType,
 				MissingKeys:              ticket.MissingKeys,
 				ReconstructedFileHash:    nil,
-				RaptorQSymbols:           nil,
-				FileIDs:                  nil,
 				IsReconstructionRequired: false,
 			}
 			logger.Info("sending response for verification")
@@ -215,7 +211,7 @@ func (task *SHTask) ProcessSelfHealingChallenge(ctx context.Context, event types
 		}
 		logger.Info("going to initiate sense self-healing")
 
-		ids, idFiles, fileHash, err := task.senseSelfHealing(ctx, senseTicket, sortedFiles)
+		_, idFiles, fileHash, err := task.senseSelfHealing(ctx, senseTicket, sortedFiles)
 		if err != nil {
 			logger.WithError(err).Error("self-healing failed for sense ticket")
 			return err
@@ -227,7 +223,6 @@ func (task *SHTask) ProcessSelfHealingChallenge(ctx context.Context, event types
 			TicketType:               ticket.TicketType,
 			MissingKeys:              ticket.MissingKeys,
 			ReconstructedFileHash:    fileHash,
-			FileIDs:                  ids,
 			IsReconstructionRequired: true,
 		}
 		logger.Info("sending response for verification")

walletnode/api/design/selfhealing.go

@@ -197,7 +197,7 @@ var SelfHealingMessage = Type("SelfHealingMessage", func() {
 var SelfHealingMessageData = Type("SelfHealingMessageData", func() {
 	Attribute("challenger_id", String)
 	Attribute("recipient_id", String)
-	Attribute("challenge", SelfHealingChallengeData)
+	Attribute("event_details", SelfHealingChallengeData)
 	Attribute("response", SelfHealingResponseData)
 	Attribute("verification", SelfHealingVerificationData)
 })
@@ -207,12 +207,12 @@ var SelfHealingChallengeData = Type("SelfHealingChallengeData", func() {
 	Attribute("block", Int32)
 	Attribute("merkelroot", String)
 	Attribute("timestamp", String) // Goa does not directly support time.Time, use string and format as RFC3339
-	Attribute("challenge_tickets", ArrayOf(ChallengeTicket))
+	Attribute("event_tickets", ArrayOf(ChallengeTicket))
 	Attribute("nodes_on_watchlist", String)
 })
 
 // ChallengeTicket is the result type for the challenge ticket
-var ChallengeTicket = Type("ChallengeTicket", func() {
+var ChallengeTicket = Type("EventTicket", func() {
 	Attribute("tx_id", String)
 	Attribute("ticket_type", String) // Assuming TicketType is an enum or similar in Go, represented as String here
 	Attribute("missing_keys", ArrayOf(String))
@@ -222,7 +222,7 @@ var ChallengeTicket = Type("ChallengeTicket", func() {
 
 // SelfHealingResponseData is the result type for the self-healing response data
 var SelfHealingResponseData = Type("SelfHealingResponseData", func() {
-	Attribute("challenge_id", String)
+	Attribute("event_id", String)
 	Attribute("block", Int32)
 	Attribute("merkelroot", String)
 	Attribute("timestamp", String) // Use string for time.Time
@@ -236,14 +236,12 @@ var RespondedTicket = Type("RespondedTicket", func() {
 	Attribute("ticket_type", String) // Assuming TicketType is an enum or similar in Go
 	Attribute("missing_keys", ArrayOf(String))
 	Attribute("reconstructed_file_hash", Bytes)
-	Attribute("sense_file_ids", ArrayOf(String))
-	Attribute("raptor_q_symbols", Bytes)
 	Attribute("is_reconstruction_required", Boolean)
 })
 
 // SelfHealingVerificationData is the result type for the self-healing verification data
 var SelfHealingVerificationData = Type("SelfHealingVerificationData", func() {
-	Attribute("challenge_id", String)
+	Attribute("event_id", String)
 	Attribute("block", Int32)
 	Attribute("merkelroot", String)
 	Attribute("timestamp", String) // Use string for time.Time
@@ -258,8 +256,6 @@ var VerifiedTicket = Type("VerifiedTicket", func() {
 	Attribute("missing_keys", ArrayOf(String))
 	Attribute("reconstructed_file_hash", Bytes)
 	Attribute("is_reconstruction_required", Boolean)
-	Attribute("raptor_q_symbols", Bytes)
-	Attribute("sense_file_ids", ArrayOf(String))
 	Attribute("is_verified", Boolean)
 	Attribute("message", String)
 })