Change %w to %v in logs (0xPolygonHermez#1764)

giacomolicari · Mar 7, 2023 · b8def2b · b8def2b
1 parent b4bb7ad
commit b8def2b
Show file tree

Hide file tree

Showing 10 changed files with 34 additions and 34 deletions.
diff --git a/aggregator/aggregator.go b/aggregator/aggregator.go
@@ -460,7 +460,7 @@ func (a *Aggregator) validateEligibleFinalProof(ctx context.Context, proof *stat
 			log.Warnf("Proof %d-%d lower than next batch to verify %d. Deleting it", proof.BatchNumber, proof.BatchNumberFinal, batchNumberToVerify)
 			err := a.State.DeleteGeneratedProofs(ctx, proof.BatchNumber, proof.BatchNumberFinal, nil)
 			if err != nil {
-				return false, fmt.Errorf("Failed to delete discarded proof, err: %w", err)
+				return false, fmt.Errorf("failed to delete discarded proof, err: %w", err)
 			}
 			return false, nil
 		} else {

diff --git a/aggregator/prover/prover.go b/aggregator/prover/prover.go
@@ -92,7 +92,7 @@ func (p *Prover) IsIdle() (bool, error) {
 func (p *Prover) SupportsForkID(forkID uint64) bool {
 	status, err := p.Status()
 	if err != nil {
-		log.Warnf("Error asking status for prover ID %s: %w", p.ID(), err)
+		log.Warnf("Error asking status for prover ID %s: %v", p.ID(), err)
 		return false
 	}
 
@@ -119,15 +119,15 @@ func (p *Prover) BatchProof(input *pb.InputProver) (*string, error) {
 	if msg, ok := res.Response.(*pb.ProverMessage_GenBatchProofResponse); ok {
 		switch msg.GenBatchProofResponse.Result {
 		case pb.Result_RESULT_UNSPECIFIED:
-			return nil, fmt.Errorf("Failed to generate proof %s, %w, input %v", msg.GenBatchProofResponse.String(), ErrUnspecified, input)
+			return nil, fmt.Errorf("failed to generate proof %s, %w, input %v", msg.GenBatchProofResponse.String(), ErrUnspecified, input)
 		case pb.Result_RESULT_OK:
 			return &msg.GenBatchProofResponse.Id, nil
 		case pb.Result_RESULT_ERROR:
-			return nil, fmt.Errorf("Failed to generate proof %s, %w, input %v", msg.GenBatchProofResponse.String(), ErrBadRequest, input)
+			return nil, fmt.Errorf("failed to generate proof %s, %w, input %v", msg.GenBatchProofResponse.String(), ErrBadRequest, input)
 		case pb.Result_RESULT_INTERNAL_ERROR:
-			return nil, fmt.Errorf("Failed to generate proof %s, %w, input %v", msg.GenBatchProofResponse.String(), ErrProverInternalError, input)
+			return nil, fmt.Errorf("failed to generate proof %s, %w, input %v", msg.GenBatchProofResponse.String(), ErrProverInternalError, input)
 		default:
-			return nil, fmt.Errorf("Failed to generate proof %s, %w,input %v", msg.GenBatchProofResponse.String(), ErrUnknown, input)
+			return nil, fmt.Errorf("failed to generate proof %s, %w,input %v", msg.GenBatchProofResponse.String(), ErrUnknown, input)
 		}
 	}
 
@@ -155,18 +155,18 @@ func (p *Prover) AggregatedProof(inputProof1, inputProof2 string) (*string, erro
 	if msg, ok := res.Response.(*pb.ProverMessage_GenAggregatedProofResponse); ok {
 		switch msg.GenAggregatedProofResponse.Result {
 		case pb.Result_RESULT_UNSPECIFIED:
-			return nil, fmt.Errorf("Failed to aggregate proofs %s, %w, input 1 %s, input 2 %s",
+			return nil, fmt.Errorf("failed to aggregate proofs %s, %w, input 1 %s, input 2 %s",
 				msg.GenAggregatedProofResponse.String(), ErrUnspecified, inputProof1, inputProof2)
 		case pb.Result_RESULT_OK:
 			return &msg.GenAggregatedProofResponse.Id, nil
 		case pb.Result_RESULT_ERROR:
-			return nil, fmt.Errorf("Failed to aggregate proofs %s, %w, input 1 %s, input 2 %s",
+			return nil, fmt.Errorf("failed to aggregate proofs %s, %w, input 1 %s, input 2 %s",
 				msg.GenAggregatedProofResponse.String(), ErrBadRequest, inputProof1, inputProof2)
 		case pb.Result_RESULT_INTERNAL_ERROR:
-			return nil, fmt.Errorf("Failed to aggregate proofs %s, %w, input 1 %s, input 2 %s",
+			return nil, fmt.Errorf("failed to aggregate proofs %s, %w, input 1 %s, input 2 %s",
 				msg.GenAggregatedProofResponse.String(), ErrProverInternalError, inputProof1, inputProof2)
 		default:
-			return nil, fmt.Errorf("Failed to aggregate proofs %s, %w, input 1 %s, input 2 %s",
+			return nil, fmt.Errorf("failed to aggregate proofs %s, %w, input 1 %s, input 2 %s",
 				msg.GenAggregatedProofResponse.String(), ErrUnknown, inputProof1, inputProof2)
 		}
 	}
@@ -195,18 +195,18 @@ func (p *Prover) FinalProof(inputProof string, aggregatorAddr string) (*string,
 	if msg, ok := res.Response.(*pb.ProverMessage_GenFinalProofResponse); ok {
 		switch msg.GenFinalProofResponse.Result {
 		case pb.Result_RESULT_UNSPECIFIED:
-			return nil, fmt.Errorf("Failed to generate final proof %s, %w, input %s",
+			return nil, fmt.Errorf("failed to generate final proof %s, %w, input %s",
 				msg.GenFinalProofResponse.String(), ErrUnspecified, inputProof)
 		case pb.Result_RESULT_OK:
 			return &msg.GenFinalProofResponse.Id, nil
 		case pb.Result_RESULT_ERROR:
-			return nil, fmt.Errorf("Failed to generate final proof %s, %w, input %s",
+			return nil, fmt.Errorf("failed to generate final proof %s, %w, input %s",
 				msg.GenFinalProofResponse.String(), ErrBadRequest, inputProof)
 		case pb.Result_RESULT_INTERNAL_ERROR:
-			return nil, fmt.Errorf("Failed to generate final proof %s, %w, input %s",
+			return nil, fmt.Errorf("failed to generate final proof %s, %w, input %s",
 				msg.GenFinalProofResponse.String(), ErrProverInternalError, inputProof)
 		default:
-			return nil, fmt.Errorf("Failed to generate final proof %s, %w, input %s",
+			return nil, fmt.Errorf("failed to generate final proof %s, %w, input %s",
 				msg.GenFinalProofResponse.String(), ErrUnknown, inputProof)
 		}
 	}
@@ -228,18 +228,18 @@ func (p *Prover) CancelProofRequest(proofID string) error {
 	if msg, ok := res.Response.(*pb.ProverMessage_CancelResponse); ok {
 		switch msg.CancelResponse.Result {
 		case pb.Result_RESULT_UNSPECIFIED:
-			return fmt.Errorf("Failed to cancel proof id [%s], %w, %s",
+			return fmt.Errorf("failed to cancel proof id [%s], %w, %s",
 				proofID, ErrUnspecified, msg.CancelResponse.String())
 		case pb.Result_RESULT_OK:
 			return nil
 		case pb.Result_RESULT_ERROR:
-			return fmt.Errorf("Failed to cancel proof id [%s], %w, %s",
+			return fmt.Errorf("failed to cancel proof id [%s], %w, %s",
 				proofID, ErrBadRequest, msg.CancelResponse.String())
 		case pb.Result_RESULT_INTERNAL_ERROR:
-			return fmt.Errorf("Failed to cancel proof id [%s], %w, %s",
+			return fmt.Errorf("failed to cancel proof id [%s], %w, %s",
 				proofID, ErrProverInternalError, msg.CancelResponse.String())
 		default:
-			return fmt.Errorf("Failed to cancel proof id [%s], %w, %s",
+			return fmt.Errorf("failed to cancel proof id [%s], %w, %s",
 				proofID, ErrUnknown, msg.CancelResponse.String())
 		}
 	}
@@ -297,24 +297,24 @@ func (p *Prover) waitProof(ctx context.Context, proofID string) (*pb.GetProofRes
 					time.Sleep(p.proofStatePollingInterval.Duration)
 					continue
 				case pb.GetProofResponse_RESULT_UNSPECIFIED:
-					return nil, fmt.Errorf("Failed to get proof ID: %s, %w, prover response: %s",
+					return nil, fmt.Errorf("failed to get proof ID: %s, %w, prover response: %s",
 						proofID, ErrUnspecified, msg.GetProofResponse.String())
 				case pb.GetProofResponse_RESULT_COMPLETED_OK:
 					return msg.GetProofResponse, nil
 				case pb.GetProofResponse_RESULT_ERROR:
-					return nil, fmt.Errorf("Failed to get proof with ID %s, %w, prover response: %s",
+					return nil, fmt.Errorf("failed to get proof with ID %s, %w, prover response: %s",
 						proofID, ErrBadRequest, msg.GetProofResponse.String())
 				case pb.GetProofResponse_RESULT_COMPLETED_ERROR:
-					return nil, fmt.Errorf("Failed to get proof with ID %s, %w, prover response: %s",
+					return nil, fmt.Errorf("failed to get proof with ID %s, %w, prover response: %s",
 						proofID, ErrProverCompletedError, msg.GetProofResponse.String())
 				case pb.GetProofResponse_RESULT_INTERNAL_ERROR:
-					return nil, fmt.Errorf("Failed to get proof ID: %s, %w, prover response: %s",
+					return nil, fmt.Errorf("failed to get proof ID: %s, %w, prover response: %s",
 						proofID, ErrProverInternalError, msg.GetProofResponse.String())
 				case pb.GetProofResponse_RESULT_CANCEL:
-					return nil, fmt.Errorf("Proof generation was cancelled for proof ID %s, %w, prover response: %s",
+					return nil, fmt.Errorf("proof generation was cancelled for proof ID %s, %w, prover response: %s",
 						proofID, ErrProofCanceled, msg.GetProofResponse.String())
 				default:
-					return nil, fmt.Errorf("Failed to get proof ID: %s, %w, prover response: %s",
+					return nil, fmt.Errorf("failed to get proof ID: %s, %w, prover response: %s",
 						proofID, ErrUnknown, msg.GetProofResponse.String())
 				}
 			}

diff --git a/ci/e2e-group1/forced_batches_test.go b/ci/e2e-group1/forced_batches_test.go
@@ -166,7 +166,7 @@ func sendForcedBatch(t *testing.T, opsman *operations.Manager) (*state.Batch, er
 		log.Info("Transactions: ", common.Bytes2Hex(fb.Transactions))
 		fullBlock, err := ethClient.BlockByHash(ctx, vLog.BlockHash)
 		if err != nil {
-			log.Errorf("error getting hashParent. BlockNumber: %d. Error: %w", vLog.BlockNumber, err)
+			log.Errorf("error getting hashParent. BlockNumber: %d. Error: %v", vLog.BlockNumber, err)
 			return nil, err
 		}
 		log.Info("MinForcedTimestamp: ", fullBlock.Time())

diff --git a/sequencer/closingsignalsmanager.go b/sequencer/closingsignalsmanager.go
@@ -81,7 +81,7 @@ func (c *closingSignalsManager) checkForcedBatches() {
 		// Take into account L1 finality
 		lastBlock, err := c.dbManager.GetLastBlock(c.ctx, nil)
 		if err != nil {
-			log.Errorf("failed to get latest eth block number, err: %w", err)
+			log.Errorf("failed to get latest eth block number, err: %v", err)
 			continue
 		}
 

diff --git a/sequencer/finalizer.go b/sequencer/finalizer.go
@@ -268,7 +268,7 @@ func (f *finalizer) newWIPBatch(ctx context.Context) (*WipBatch, error) {
 		// backup current sequence
 		err = f.processTransaction(ctx, nil)
 		for err != nil {
-			log.Errorf("failed to process tx, err: %w", err)
+			log.Errorf("failed to process tx, err: %v", err)
 			err = f.processTransaction(ctx, nil)
 		}
 	}

diff --git a/state/state.go b/state/state.go
@@ -779,7 +779,7 @@ func (s *State) ProcessAndStoreClosedBatch(
 	// Decode transactions
 	decodedTransactions, _, err := DecodeTxs(encodedTxs)
 	if err != nil && !errors.Is(err, InvalidData) {
-		log.Debugf("error decoding transactions: %w", err)
+		log.Debugf("error decoding transactions: %v", err)
 		return err
 	}
 
@@ -1507,10 +1507,10 @@ func (s *State) WaitSequencingTxToBeSynced(parentCtx context.Context, tx *types.
 	for {
 		virtualized, err := s.IsSequencingTXSynced(ctx, tx.Hash(), nil)
 		if err != nil && err != ErrNotFound {
-			log.Errorf("error waiting sequencing tx %s to be synced: %w", tx.Hash().String(), err)
+			log.Errorf("error waiting sequencing tx %s to be synced: %v", tx.Hash().String(), err)
 			return err
 		} else if ctx.Err() != nil {
-			log.Errorf("error waiting sequencing tx %s to be synced: %w", tx.Hash().String(), err)
+			log.Errorf("error waiting sequencing tx %s to be synced: %v", tx.Hash().String(), err)
 			return ctx.Err()
 		} else if virtualized {
 			break

diff --git a/test/e2e/forcedbatches_test.go b/test/e2e/forcedbatches_test.go
@@ -171,7 +171,7 @@ func sendForcedBatch(t *testing.T, opsman *operations.Manager) (*state.Batch, er
 		log.Info("Transactions: ", common.Bytes2Hex(fb.Transactions))
 		fullBlock, err := ethClient.BlockByHash(ctx, vLog.BlockHash)
 		if err != nil {
-			log.Errorf("error getting hashParent. BlockNumber: %d. Error: %w", vLog.BlockNumber, err)
+			log.Errorf("error getting hashParent. BlockNumber: %d. Error: %v", vLog.BlockNumber, err)
 			return nil, err
 		}
 		log.Info("MinForcedTimestamp: ", fullBlock.Time())

diff --git a/test/operations/manager.go b/test/operations/manager.go
@@ -504,7 +504,7 @@ func stopNode() error {
 func runCmd(c *exec.Cmd) error {
 	dir, err := os.Getwd()
 	if err != nil {
-		log.Fatalf("failed to get current work directory: %w", err)
+		log.Fatalf("failed to get current work directory: %v", err)
 	}
 
 	if strings.Contains(dir, cmdFolder) {

diff --git a/test/scripts/sendForcedBatch/main.go b/test/scripts/sendForcedBatch/main.go
@@ -143,7 +143,7 @@ func sendForcedBatches(cliCtx *cli.Context) error {
 			log.Info("Transactions: ", common.Bytes2Hex(fb.Transactions))
 			fullBlock, err := ethClient.BlockByHash(ctx, vLog.BlockHash)
 			if err != nil {
-				log.Errorf("error getting hashParent. BlockNumber: %d. Error: %w", vLog.BlockNumber, err)
+				log.Errorf("error getting hashParent. BlockNumber: %d. Error: %v", vLog.BlockNumber, err)
 				return err
 			}
 			log.Info("MinForcedTimestamp: ", fullBlock.Time())

diff --git a/tools/executor/main.go b/tools/executor/main.go
@@ -42,7 +42,7 @@ func main() {
 	time.Sleep(time.Second * waitForDBSeconds)
 	cmd = exec.Command("docker-compose", "up", "-d", "executor-tool-prover")
 	if out, err := cmd.CombinedOutput(); err != nil {
-		log.Errorf("Failed to star prover: %w. %v", err, out)
+		log.Errorf("Failed to star prover: %v. %v", err, out)
 		return
 	}
 	log.Info("DONE starting DB and prover")