Skip to content

Commit 2354eb2

Browse files
committed
fix: lint go code
1 parent 69d4fa0 commit 2354eb2

File tree

7 files changed

+68
-16
lines changed

7 files changed

+68
-16
lines changed

.github/workflows/golangci-lint.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
name: golangci-lint
22
on:
33
push:
4-
branches: ["*"]
4+
branches:
5+
- testnet
6+
- staging
57
pull_request:
68
paths:
79
- 'operator/**'

aggregator/pkg/server.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -92,11 +92,11 @@ func (agg *Aggregator) ProcessOperatorSignedTaskResponseV2(signedTaskResponse *t
9292

9393
if err != nil {
9494
agg.logger.Warnf("BLS aggregation service error: %s", err)
95-
done<- 1
95+
done <- 1
9696
// todo shouldn't we here close the channel with a reply = 1?
9797
} else {
9898
agg.logger.Info("BLS process succeeded")
99-
done<- 0
99+
done <- 0
100100
}
101101

102102
close(done)
@@ -136,7 +136,7 @@ func (agg *Aggregator) GetTaskIndexRetryable(batchIdentifierHash [32]byte, confi
136136
taskIndex, ok := agg.batchesIdxByIdentifierHash[batchIdentifierHash]
137137
agg.taskMutex.Unlock()
138138
if !ok {
139-
return taskIndex, fmt.Errorf("Task not found in the internal map")
139+
return taskIndex, fmt.Errorf("task not found in the internal map")
140140
} else {
141141
return taskIndex, nil
142142
}

aggregator/pkg/telemetry.go

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,12 @@ func (t *Telemetry) sendTelemetryMessage(endpoint string, message interface{}) e
152152
t.logger.Warn("[Telemetry] Error sending POST request", "error", err)
153153
return fmt.Errorf("error making POST request: %w", err)
154154
}
155-
defer resp.Body.Close()
155+
defer func(Body io.ReadCloser) {
156+
err := Body.Close()
157+
if err != nil {
158+
t.logger.Warn("[Telemetry] Error closing response body", "error", err)
159+
}
160+
}(resp.Body)
156161

157162
respBody, err := io.ReadAll(resp.Body)
158163
if err != nil {

operator/risc_zero/risc_zero.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ func VerifyRiscZeroReceipt(innerReceiptBuffer []byte, imageIdBuffer []byte, publ
2525
defer func() {
2626
rec := recover()
2727
if rec != nil {
28-
err = fmt.Errorf("Panic was caught while verifying risc0 proof: %s", rec)
28+
err = fmt.Errorf("panic was caught while verifying risc0 proof: %s", rec)
2929
}
3030
}()
3131

@@ -42,7 +42,7 @@ func VerifyRiscZeroReceipt(innerReceiptBuffer []byte, imageIdBuffer []byte, publ
4242
}
4343

4444
if r == -1 {
45-
err = fmt.Errorf("Panic happened on FFI while verifying risc0 proof")
45+
err = fmt.Errorf("panic happened on FFI while verifying risc0 proof")
4646
return isVerified, err
4747
}
4848

scripts/test_files/gnark_groth16_bn254_infinite_script/pkg/generate_proof.go

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,9 +71,24 @@ func GenerateIneqProof(x int, outputDir string) {
7171
if err != nil {
7272
panic(err)
7373
}
74-
defer proofFile.Close()
75-
defer vkFile.Close()
76-
defer witnessFile.Close()
74+
defer func(proofFile *os.File) {
75+
err := proofFile.Close()
76+
if err != nil {
77+
log.Fatal("could not close proof file:", err)
78+
}
79+
}(proofFile)
80+
defer func(vkFile *os.File) {
81+
err := vkFile.Close()
82+
if err != nil {
83+
log.Fatal("could not close verification key file:", err)
84+
}
85+
}(vkFile)
86+
defer func(witnessFile *os.File) {
87+
err := witnessFile.Close()
88+
if err != nil {
89+
log.Fatal("could not close witness file:", err)
90+
}
91+
}(witnessFile)
7792

7893
_, err = proof.WriteTo(proofFile)
7994
if err != nil {

scripts/test_files/gnark_groth16_bn254_script/main.go

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -94,9 +94,24 @@ func main() {
9494
if err != nil {
9595
panic(err)
9696
}
97-
defer proofFile.Close()
98-
defer vkFile.Close()
99-
defer witnessFile.Close()
97+
defer func(proofFile *os.File) {
98+
err := proofFile.Close()
99+
if err != nil {
100+
log.Fatal("could not close proof file:", err)
101+
}
102+
}(proofFile)
103+
defer func(vkFile *os.File) {
104+
err := vkFile.Close()
105+
if err != nil {
106+
log.Fatal("could not close verification key file:", err)
107+
}
108+
}(vkFile)
109+
defer func(witnessFile *os.File) {
110+
err := witnessFile.Close()
111+
if err != nil {
112+
log.Fatal("could not close witness file:", err)
113+
}
114+
}(witnessFile)
100115

101116
_, err = proof.WriteTo(proofFile)
102117
if err != nil {

scripts/test_files/gnark_plonk_bls12_381_script/main.go

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -96,9 +96,24 @@ func main() {
9696
if err != nil {
9797
panic(err)
9898
}
99-
defer proofFile.Close()
100-
defer vkFile.Close()
101-
defer witnessFile.Close()
99+
defer func(proofFile *os.File) {
100+
err := proofFile.Close()
101+
if err != nil {
102+
log.Fatal("could not close proof file:", err)
103+
}
104+
}(proofFile)
105+
defer func(vkFile *os.File) {
106+
err := vkFile.Close()
107+
if err != nil {
108+
log.Fatal("could not close verification key file:", err)
109+
}
110+
}(vkFile)
111+
defer func(witnessFile *os.File) {
112+
err := witnessFile.Close()
113+
if err != nil {
114+
log.Fatal("could not close witness file:", err)
115+
}
116+
}(witnessFile)
102117

103118
_, err = proof.WriteTo(proofFile)
104119
if err != nil {

0 commit comments

Comments
 (0)