Skip to content

Commit 2c64a58

Browse files
[chore]: consistent use logger.Error and errors.New
With go1.24, `go vet` highlights misuse of format string functions, such as, `fmt.Errorf()`. This commit make go vet happy again. Signed-off-by: Marcus Brandenburger <bur@zurich.ibm.com>
1 parent 94bb971 commit 2c64a58

2 files changed

Lines changed: 14 additions & 13 deletions

File tree

ecc/chaincode/ecc.go

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -57,14 +57,14 @@ func (t *EnclaveChaincode) initEnclave(stub shim.ChaincodeStubInterface) pb.Resp
5757
initMsg, err := t.Extractor.GetInitEnclaveMessage(stub)
5858
if err != nil {
5959
errMsg := fmt.Sprintf("getting initEnclave msg failed: %s", err.Error())
60-
logger.Errorf(errMsg)
60+
logger.Error(errMsg)
6161
return shim.Error(errMsg)
6262
}
6363

6464
chaincodeParams, err := t.Extractor.GetChaincodeParams(stub)
6565
if err != nil {
6666
errMsg := fmt.Sprintf("getting chaincode params failed: %s", err.Error())
67-
logger.Errorf(errMsg)
67+
logger.Error(errMsg)
6868
return shim.Error(errMsg)
6969
}
7070
serializedChaincodeParams, err := protoutil.Marshal(chaincodeParams)
@@ -75,7 +75,7 @@ func (t *EnclaveChaincode) initEnclave(stub shim.ChaincodeStubInterface) pb.Resp
7575
hostParams, err := t.Extractor.GetHostParams(stub)
7676
if err != nil {
7777
errMsg := fmt.Sprintf("getting host params failed: %s", err.Error())
78-
logger.Errorf(errMsg)
78+
logger.Error(errMsg)
7979
return shim.Error(errMsg)
8080
}
8181

@@ -88,7 +88,7 @@ func (t *EnclaveChaincode) initEnclave(stub shim.ChaincodeStubInterface) pb.Resp
8888
credentialsBytes, err := t.Enclave.Init(serializedChaincodeParams, serializedHostParams, initMsg.AttestationParams)
8989
if err != nil {
9090
errMsg := fmt.Sprintf("Enclave Init function failed: %s", err.Error())
91-
logger.Errorf(errMsg)
91+
logger.Error(errMsg)
9292
return shim.Error(errMsg)
9393
}
9494

@@ -102,14 +102,14 @@ func (t *EnclaveChaincode) invoke(stub shim.ChaincodeStubInterface) pb.Response
102102
serializedChaincodeRequest, err := t.Extractor.GetSerializedChaincodeRequest(stub)
103103
if err != nil {
104104
errMsg = fmt.Sprintf("cannot get chaincode request message from input: %s", err.Error())
105-
logger.Errorf(errMsg)
105+
logger.Error(errMsg)
106106
return shim.Error(errMsg)
107107
}
108108

109109
signedChaincodeResponseMessage, errInvoke := t.Enclave.ChaincodeInvoke(stub, serializedChaincodeRequest)
110110
if errInvoke != nil {
111111
errMsg = fmt.Sprintf("t.Enclave.Invoke failed: %s", errInvoke)
112-
logger.Errorf(errMsg)
112+
logger.Error(errMsg)
113113
// likely a chaincode error, so we still want response go back ...
114114
}
115115

@@ -139,14 +139,14 @@ func (t *EnclaveChaincode) endorse(stub shim.ChaincodeStubInterface) pb.Response
139139
chaincodeParams, err := t.Extractor.GetChaincodeParams(stub)
140140
if err != nil {
141141
errMsg := fmt.Sprintf("cannot extract chaincode params: %s", err.Error())
142-
logger.Errorf(errMsg)
142+
logger.Error(errMsg)
143143
return shim.Error(errMsg)
144144
}
145145

146146
signedResponseMsg, responseMsg, err := t.Extractor.GetChaincodeResponseMessages(stub)
147147
if err != nil {
148148
errMsg := fmt.Sprintf("cannot extract chaincode response message: %s", err.Error())
149-
logger.Errorf(errMsg)
149+
logger.Error(errMsg)
150150
return shim.Error(errMsg)
151151
}
152152

@@ -175,20 +175,20 @@ func (t *EnclaveChaincode) endorse(stub shim.ChaincodeStubInterface) pb.Response
175175
// check cc param.MSPID matches MSPID of endorser (Post-MVP)
176176

177177
// validate enclave endorsement signature
178-
logger.Debugf("Validating endorsement")
178+
logger.Debug("Validating endorsement")
179179
err = t.Validator.Validate(signedResponseMsg, attestedData)
180180
if err != nil {
181181
return shim.Error(err.Error())
182182
}
183183

184184
// replay read/writes from kvrwset from Enclave (to prepare commitment to ledger) and extract kvrwset for subsequent validation
185-
logger.Debugf("Replaying rwset")
185+
logger.Debug("Replaying rwset")
186186
err = t.Validator.ReplayReadWrites(stub, responseMsg.FpcRwSet)
187187
if err != nil {
188188
return shim.Error(err.Error())
189189
}
190190

191-
logger.Debugf("Endorsement successful")
191+
logger.Debug("Endorsement successful")
192192
return shim.Success([]byte("OK")) // make sure we have a non-empty return on success so we can distinguish success from failure in cli ...
193193
}
194194

ecc/chaincode/enclave/enclave.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ package enclave
1212

1313
import (
1414
"context"
15+
"errors"
1516
"fmt"
1617
"unsafe"
1718

@@ -80,7 +81,7 @@ func (e *EnclaveStub) Init(chaincodeParams, hostParams, attestationParams []byte
8081
if ret != 0 {
8182
msg := fmt.Sprintf("can not create enclave (%s): Reason: %v", enclaveLibFile, ret)
8283
logger.Error(msg)
83-
return nil, fmt.Errorf(msg)
84+
return nil, errors.New(msg)
8485
}
8586
e.eid = eid
8687
e.sem.Release(1)
@@ -114,7 +115,7 @@ func (e *EnclaveStub) ChaincodeInvoke(stub shim.ChaincodeStubInterface, crmProto
114115
const scresmProtoBytesMaxLen = 1024 * 100 // Let's be really conservative ...
115116

116117
if !e.isInitialized {
117-
return nil, fmt.Errorf("enclave not yet initialized")
118+
return nil, errors.New("enclave not yet initialized")
118119
}
119120

120121
// register our stub for callbacks

0 commit comments

Comments
 (0)