diff --git a/prover/server/main.go b/prover/server/main.go index 886b2900bb..7a693a5413 100644 --- a/prover/server/main.go +++ b/prover/server/main.go @@ -4,6 +4,7 @@ import ( "bytes" _ "embed" "encoding/json" + "errors" "fmt" "io" "light/light-prover/logging" @@ -65,28 +66,28 @@ func runCli() { batchAddressAppendBatchSize := uint32(context.Uint("address-append-batch-size")) if (inclusionTreeHeight == 0 || inclusionNumberOfCompressedAccounts == 0) && circuit == prover.InclusionCircuitType { - return fmt.Errorf("inclusion tree height and number of compressed accounts must be provided") + return errors.New("inclusion tree height and number of compressed accounts must be provided") } if (nonInclusionTreeHeight == 0 || nonInclusionNumberOfCompressedAccounts == 0) && circuit == prover.NonInclusionCircuitType { - return fmt.Errorf("non-inclusion tree height and number of compressed accounts must be provided") + return errors.New("non-inclusion tree height and number of compressed accounts must be provided") } if circuit == prover.CombinedCircuitType { if inclusionTreeHeight == 0 || inclusionNumberOfCompressedAccounts == 0 { - return fmt.Errorf("inclusion tree height and number of compressed accounts must be provided") + return errors.New("inclusion tree height and number of compressed accounts must be provided") } if nonInclusionTreeHeight == 0 || nonInclusionNumberOfCompressedAccounts == 0 { - return fmt.Errorf("non-inclusion tree height and number of compressed accounts must be provided") + return errors.New("non-inclusion tree height and number of compressed accounts must be provided") } } if (batchUpdateTreeHeight == 0 || batchUpdateBatchSize == 0) && circuit == prover.BatchUpdateCircuitType { - return fmt.Errorf("[Batch update]: tree height and batch size must be provided") + return errors.New("[Batch update]: tree height and batch size must be provided") } if (batchAddressAppendTreeHeight == 0 || batchAddressAppendBatchSize == 0) && circuit == prover.BatchAddressAppendCircuitType { - return fmt.Errorf("[Batch address append]: tree height and batch size must be provided") + return errors.New("[Batch address append]: tree height and batch size must be provided") } logging.Logger().Info().Msg("Running setup") @@ -168,28 +169,28 @@ func runCli() { batchAddressAppendBatchSize := uint32(context.Uint("address-append-batch-size")) if (inclusionTreeHeight == 0 || inclusionNumberOfCompressedAccounts == 0) && circuit == "inclusion" { - return fmt.Errorf("[Inclusion]: tree height and number of compressed accounts must be provided") + return errors.New("[Inclusion]: tree height and number of compressed accounts must be provided") } if (nonInclusionTreeHeight == 0 || nonInclusionNumberOfCompressedAccounts == 0) && circuit == "non-inclusion" { - return fmt.Errorf("[Non-inclusion]: tree height and number of compressed accounts must be provided") + return errors.New("[Non-inclusion]: tree height and number of compressed accounts must be provided") } if circuit == "combined" { if inclusionTreeHeight == 0 || inclusionNumberOfCompressedAccounts == 0 { - return fmt.Errorf("[Combined]: tree height and number of compressed accounts must be provided") + return errors.New("[Combined]: tree height and number of compressed accounts must be provided") } if nonInclusionTreeHeight == 0 || nonInclusionNumberOfCompressedAccounts == 0 { - return fmt.Errorf("[Combined]: tree height and number of compressed accounts must be provided") + return errors.New("[Combined]: tree height and number of compressed accounts must be provided") } } if (batchUpdateTreeHeight == 0 || batchUpdateBatchSize == 0) && circuit == prover.BatchUpdateCircuitType { - return fmt.Errorf("[Batch update]: tree height and batch size must be provided") + return errors.New("[Batch update]: tree height and batch size must be provided") } if (batchAddressAppendTreeHeight == 0 || batchAddressAppendBatchSize == 0) && circuit == prover.BatchAddressAppendCircuitType { - return fmt.Errorf("[Batch address append]: tree height and batch size must be provided") + return errors.New("[Batch address append]: tree height and batch size must be provided") } logging.Logger().Info().Msg("Building R1CS") @@ -274,7 +275,7 @@ func runCli() { if circuit == "append" { if batchAppendTreeHeight == 0 || batchAppendBatchSize == 0 { - return fmt.Errorf("append tree height and batch size must be provided") + return errors.New("append tree height and batch size must be provided") } var system *prover.ProvingSystemV2 system, err = prover.ImportBatchAppendSetup(batchAppendTreeHeight, batchAppendBatchSize, pk, vk) @@ -284,7 +285,7 @@ func runCli() { err = prover.WriteProvingSystem(system, path, "") } else if circuit == "update" { if batchUpdateTreeHeight == 0 || batchUpdateBatchSize == 0 { - return fmt.Errorf("append tree height and batch size must be provided") + return errors.New("append tree height and batch size must be provided") } var system *prover.ProvingSystemV2 system, err = prover.ImportBatchUpdateSetup(batchUpdateTreeHeight, batchUpdateBatchSize, pk, vk) @@ -294,7 +295,7 @@ func runCli() { err = prover.WriteProvingSystem(system, path, "") } else if circuit == "address-append" { if batchAddressAppendTreeHeight == 0 || batchAddressAppendBatchSize == 0 { - return fmt.Errorf("append tree height and batch size must be provided") + return errors.New("append tree height and batch size must be provided") } var system *prover.ProvingSystemV2 system, err = prover.ImportBatchAddressAppendSetup(batchAddressAppendTreeHeight, batchAddressAppendBatchSize, pk, vk) @@ -305,12 +306,12 @@ func runCli() { } else { if circuit == "inclusion" || circuit == "combined" { if inclusionTreeHeight == 0 || inclusionNumberOfCompressedAccounts == 0 { - return fmt.Errorf("inclusion tree height and number of compressed accounts must be provided") + return errors.New("inclusion tree height and number of compressed accounts must be provided") } } if circuit == "non-inclusion" || circuit == "combined" { if nonInclusionTreeHeight == 0 || nonInclusionNumberOfCompressedAccounts == 0 { - return fmt.Errorf("non-inclusion tree height and number of compressed accounts must be provided") + return errors.New("non-inclusion tree height and number of compressed accounts must be provided") } } @@ -359,7 +360,7 @@ func runCli() { case *prover.ProvingSystemV2: vk = s.VerifyingKey default: - return fmt.Errorf("unknown proving system type") + return errors.New("unknown proving system type") } var buf bytes.Buffer @@ -466,7 +467,7 @@ func runCli() { } if len(psv1) == 0 && len(psv2) == 0 { - return fmt.Errorf("no proving systems loaded") + return errors.New("no proving systems loaded") } redisURL := context.String("redis-url") @@ -499,7 +500,7 @@ func runCli() { if enableQueue { if redisURL == "" { - return fmt.Errorf("Redis URL is required for queue mode. Use --redis-url or set REDIS_URL environment variable") + return errors.New("Redis URL is required for queue mode. Use --redis-url or set REDIS_URL environment variable") } redisQueue, err = server.NewRedisQueue(redisURL) @@ -580,7 +581,7 @@ func runCli() { } if !enableServer && !enableQueue { - return fmt.Errorf("at least one of server or queue mode must be enabled") + return errors.New("at least one of server or queue mode must be enabled") } sigint := make(chan os.Signal, 1) @@ -652,7 +653,7 @@ func runCli() { } if len(psv1) == 0 && len(psv2) == 0 { - return fmt.Errorf("no proving systems loaded") + return errors.New("no proving systems loaded") } logging.Logger().Info().Msg("Reading params from stdin") @@ -836,7 +837,7 @@ func runCli() { return fmt.Errorf("invalid circuit type for ProvingSystemV1: %s", circuit) } default: - return fmt.Errorf("unknown proving system type") + return errors.New("unknown proving system type") } if verifyErr != nil { diff --git a/prover/server/merkle-tree/indexed_merkle_tree.go b/prover/server/merkle-tree/indexed_merkle_tree.go index 806e96d1d2..8015b2bfbf 100644 --- a/prover/server/merkle-tree/indexed_merkle_tree.go +++ b/prover/server/merkle-tree/indexed_merkle_tree.go @@ -1,6 +1,7 @@ package merkle_tree import ( + "errors" "fmt" "math/big" @@ -102,7 +103,7 @@ func (imt *IndexedMerkleTree) Append(value *big.Int) error { lowElement := imt.IndexArray.Get(lowElementIndex) if value.Cmp(lowElement.NextValue) >= 0 { - return fmt.Errorf("new value must be less than next element value") + return errors.New("new value must be less than next element value") } newElementIndex := uint32(len(imt.IndexArray.Elements)) diff --git a/prover/server/prover/batch_address_append_circuit.go b/prover/server/prover/batch_address_append_circuit.go index cb8ef6497f..f4f1cf06e1 100644 --- a/prover/server/prover/batch_address_append_circuit.go +++ b/prover/server/prover/batch_address_append_circuit.go @@ -1,6 +1,7 @@ package prover import ( + "errors" "fmt" "light/light-prover/logging" "light/light-prover/prover/poseidon" @@ -138,10 +139,10 @@ func InitBatchAddressTreeAppendCircuit(treeHeight uint32, batchSize uint32) Batc func (params *BatchAddressAppendParameters) CreateWitness() (*BatchAddressTreeAppendCircuit, error) { if params.BatchSize == 0 { - return nil, fmt.Errorf("batch size cannot be 0") + return nil, errors.New("batch size cannot be 0") } if params.TreeHeight == 0 { - return nil, fmt.Errorf("tree height cannot be 0") + return nil, errors.New("tree height cannot be 0") } circuit := &BatchAddressTreeAppendCircuit{ diff --git a/prover/server/prover/circuit_builder.go b/prover/server/prover/circuit_builder.go index 84577b5aa5..28c7d65294 100644 --- a/prover/server/prover/circuit_builder.go +++ b/prover/server/prover/circuit_builder.go @@ -2,6 +2,7 @@ package prover import ( "encoding/json" + "errors" "fmt" ) @@ -88,7 +89,7 @@ func ParseProofRequestMeta(data []byte) (ProofRequestMeta, error) { } if addressTreeHeight == 0 && stateTreeHeight == 0 && treeHeight == 0 { - return ProofRequestMeta{}, fmt.Errorf("no 'addressTreeHeight' or stateTreeHeight'or 'treeHeight' provided") + return ProofRequestMeta{}, errors.New("no 'addressTreeHeight' or stateTreeHeight'or 'treeHeight' provided") } version := uint32(0) diff --git a/prover/server/prover/proving_keys_utils.go b/prover/server/prover/proving_keys_utils.go index a90850967e..630cb01067 100644 --- a/prover/server/prover/proving_keys_utils.go +++ b/prover/server/prover/proving_keys_utils.go @@ -2,6 +2,7 @@ package prover import ( "bytes" + "errors" "fmt" "io" "light/light-prover/logging" @@ -81,7 +82,7 @@ func LoadVerifyingKey(filepath string) (verifyingKey groth16.VerifyingKey, err e f, _ := os.Open(filepath) _, err = verifyingKey.ReadFrom(f) if err != nil { - return verifyingKey, fmt.Errorf("read file error") + return verifyingKey, errors.New("read file error") } err = f.Close() if err != nil { @@ -284,7 +285,7 @@ func LoadKeys(keysDirPath string, runMode RunMode, circuits []string) ([]*Provin Uint32("batchSize", s.BatchSize). Msg("Read ProvingSystemV2") default: - return nil, nil, fmt.Errorf("unknown proving system type") + return nil, nil, errors.New("unknown proving system type") } } return pssv1, pssv2, nil @@ -325,7 +326,7 @@ func WriteProvingSystem(system interface{}, path string, pathVkey string) error case *ProvingSystemV2: written, err = s.WriteTo(file) default: - return fmt.Errorf("unknown proving system type") + return errors.New("unknown proving system type") } if err != nil { diff --git a/prover/server/server/queue.go b/prover/server/server/queue.go index b27361c935..3536882bf1 100644 --- a/prover/server/server/queue.go +++ b/prover/server/server/queue.go @@ -3,6 +3,7 @@ package server import ( "context" "encoding/json" + "errors" "fmt" "light/light-prover/logging" "light/light-prover/prover" @@ -63,7 +64,7 @@ func (rq *RedisQueue) DequeueProof(queueName string, timeout time.Duration) (*Pr } if len(result) < 2 { - return nil, fmt.Errorf("invalid result from Redis") + return nil, errors.New("invalid result from Redis") } var job ProofJob diff --git a/prover/server/server/server.go b/prover/server/server/server.go index ed6d43dd56..0631f1cfa3 100644 --- a/prover/server/server/server.go +++ b/prover/server/server/server.go @@ -30,7 +30,7 @@ func (handler proofStatusHandler) ServeHTTP(w http.ResponseWriter, r *http.Reque jobID := r.URL.Query().Get("job_id") if jobID == "" { - malformedBodyError(fmt.Errorf("job_id parameter required")).send(w) + malformedBodyError(errors.New("job_id parameter required")).send(w) return }