Skip to content

Commit 02232c5

Browse files
adecaroadecaro
committed
fix ignore error
Signed-off-by: Angelo De Caro <angelo.decaro@gmail.com>
1 parent 4dd8758 commit 02232c5

File tree

15 files changed

+57
-36
lines changed

15 files changed

+57
-36
lines changed

‎cmd/tokengen/main_test.go

+4-3
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import (
1313
"path/filepath"
1414
"testing"
1515

16+
"github.com/hyperledger-labs/fabric-smart-client/platform/common/utils"
1617
"github.com/hyperledger-labs/fabric-token-sdk/cmd/tokengen/cobra/pp/common"
1718
v1 "github.com/hyperledger-labs/fabric-token-sdk/token/core/zkatdlog/nogh/v1/setup"
1819
"github.com/hyperledger-labs/fabric-token-sdk/token/services/utils/slices"
@@ -38,7 +39,7 @@ func TestGenFullSuccess(t *testing.T) {
3839

3940
tempOutput, err := os.MkdirTemp("", "tokengen-test")
4041
gt.Expect(err).NotTo(HaveOccurred())
41-
defer os.RemoveAll(tempOutput)
42+
defer utils.IgnoreError(os.RemoveAll(tempOutput))
4243

4344
testGenRun(
4445
gt,
@@ -74,7 +75,7 @@ func TestFullUpdate(t *testing.T) {
7475

7576
tempOutput, err := os.MkdirTemp("", "tokengen-update-test")
7677
gt.Expect(err).NotTo(HaveOccurred())
77-
defer os.RemoveAll(tempOutput)
78+
defer utils.IgnoreError(os.RemoveAll(tempOutput))
7879

7980
// Switching the auditor and issuer certs to test the update function
8081
testGenRun(
@@ -111,7 +112,7 @@ func TestPartialUpdate(t *testing.T) {
111112

112113
tempOutput, err := os.MkdirTemp("", "tokengen-update-test")
113114
gt.Expect(err).NotTo(HaveOccurred())
114-
defer os.RemoveAll(tempOutput)
115+
defer utils.IgnoreError(os.RemoveAll(tempOutput))
115116

116117
// Only changing the issuer cert to also use the auditor cert.
117118
// The other auditor cert should stay the same.

‎integration/nwo/token/common/ca.go

+4-2
Original file line numberDiff line numberDiff line change
@@ -287,14 +287,16 @@ func (i *IdemixCASupport) GenerateConfiguration() error {
287287

288288
func (i *IdemixCASupport) StartSession(cmd *exec.Cmd, name string) (*gexec.Session, error) {
289289
ansiColorCode := i.nextColor()
290-
fmt.Fprintf(
290+
if _, err := fmt.Fprintf(
291291
ginkgo.GinkgoWriter,
292292
"\x1b[33m[d]\x1b[%s[%s]\x1b[0m starting %s %s\n",
293293
ansiColorCode,
294294
name,
295295
filepath.Base(cmd.Args[0]),
296296
strings.Join(cmd.Args[1:], " "),
297-
)
297+
); err != nil {
298+
return nil, err
299+
}
298300
return gexec.Start(
299301
cmd,
300302
gexec.NewPrefixedWriter(

‎integration/nwo/token/common/io.go

+4-2
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ import (
1010
"io"
1111
"os"
1212
"path/filepath"
13+
14+
"github.com/hyperledger-labs/fabric-smart-client/platform/common/utils"
1315
)
1416

1517
func CopyFile(src, dst string) error {
@@ -22,12 +24,12 @@ func CopyFile(src, dst string) error {
2224
if err != nil {
2325
return err
2426
}
25-
defer sf.Close()
27+
defer utils.CloseMute(sf)
2628
df, err := os.Create(cleanDst)
2729
if err != nil {
2830
return err
2931
}
30-
defer df.Close()
32+
defer utils.CloseMute(df)
3133
_, err = io.Copy(df, sf)
3234
return err
3335
}

‎integration/nwo/token/generators/dlog/dlog.go

+4-2
Original file line numberDiff line numberDiff line change
@@ -201,14 +201,16 @@ func (d *CryptoMaterialGenerator) Idemixgen(command common.Command) (*gexec.Sess
201201

202202
func (d *CryptoMaterialGenerator) StartSession(cmd *exec.Cmd, name string) (*gexec.Session, error) {
203203
ansiColorCode := d.nextColor()
204-
fmt.Fprintf(
204+
if _, err := fmt.Fprintf(
205205
ginkgo.GinkgoWriter,
206206
"\x1b[33m[d]\x1b[%s[%s]\x1b[0m starting %s %s\n",
207207
ansiColorCode,
208208
name,
209209
filepath.Base(cmd.Args[0]),
210210
strings.Join(cmd.Args[1:], " "),
211-
)
211+
); err != nil {
212+
return nil, err
213+
}
212214
return gexec.Start(
213215
cmd,
214216
gexec.NewPrefixedWriter(

‎integration/nwo/token/generators/dlog/dlog_test.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import (
1212

1313
math "github.com/IBM/mathlib"
1414
"github.com/hyperledger-labs/fabric-smart-client/integration/nwo/common"
15+
"github.com/hyperledger-labs/fabric-smart-client/platform/common/utils"
1516
"github.com/hyperledger-labs/fabric-token-sdk/integration/nwo/token/generators/dlog/mock"
1617
"github.com/hyperledger-labs/fabric-token-sdk/integration/nwo/token/topology"
1718
"github.com/onsi/gomega"
@@ -28,7 +29,7 @@ func TestDLogFabricCryptoMaterialGenerator_Setup(t *testing.T) {
2829

2930
tp := &mock.TokenPlatform{}
3031
tp.TokenDirReturns("./testdata/token")
31-
defer os.RemoveAll("./testdata")
32+
defer utils.IgnoreError(os.RemoveAll("./testdata"))
3233
tp.GetBuilderReturns(buildServer.Client())
3334
tms := &topology.TMS{
3435
Network: "test_network",

‎integration/nwo/token/generators/fabtoken/fabtoken.go

+8-5
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ import (
1616
"text/template"
1717
"time"
1818

19+
"github.com/hyperledger-labs/fabric-smart-client/platform/common/utils"
1920
"github.com/hyperledger-labs/fabric-token-sdk/token/services/identity/x509"
2021
"github.com/hyperledger-labs/fabric-token-sdk/token/services/identity/x509/crypto"
2122

@@ -203,8 +204,8 @@ func (d *CryptoMaterialGenerator) Generate(tms *topology.TMS, n *node.Node, wall
203204
gomega.Expect(err).NotTo(gomega.HaveOccurred())
204205
err = out.Sync()
205206
gomega.Expect(err).NotTo(gomega.HaveOccurred())
206-
in.Close()
207-
out.Close()
207+
utils.IgnoreError(in.Close())
208+
utils.IgnoreError(out.Close())
208209

209210
// delete keystore/priv_sk so that the token-sdk will interpreter this wallet as a remote one
210211
gomega.Expect(os.Remove(filepath.Join(idOutput, x509.KeystoreFolder, x509.PrivateKeyFileName))).NotTo(gomega.HaveOccurred())
@@ -237,7 +238,7 @@ func (d *CryptoMaterialGenerator) GenerateCryptoConfig(output string, layout *La
237238
gomega.Expect(os.MkdirAll(output, 0770)).NotTo(gomega.HaveOccurred())
238239
crypto, err := os.Create(filepath.Join(output, "crypto-config.yaml"))
239240
gomega.Expect(err).NotTo(gomega.HaveOccurred())
240-
defer crypto.Close()
241+
defer utils.CloseMute(crypto)
241242

242243
t, err := template.New("crypto").Parse(DefaultCryptoTemplate)
243244
gomega.Expect(err).NotTo(gomega.HaveOccurred())
@@ -262,14 +263,16 @@ func (d *CryptoMaterialGenerator) Cryptogen(command common.Command) (*gexec.Sess
262263

263264
func (d *CryptoMaterialGenerator) StartSession(cmd *exec.Cmd, name string) (*gexec.Session, error) {
264265
ansiColorCode := d.NextColor()
265-
fmt.Fprintf(
266+
if _, err := fmt.Fprintf(
266267
ginkgo.GinkgoWriter,
267268
"\x1b[33m[d]\x1b[%s[%s]\x1b[0m starting %s %s\n",
268269
ansiColorCode,
269270
name,
270271
filepath.Base(cmd.Args[0]),
271272
strings.Join(cmd.Args[1:], " "),
272-
)
273+
); err != nil {
274+
return nil, err
275+
}
273276
return gexec.Start(
274277
cmd,
275278
gexec.NewPrefixedWriter(

‎integration/nwo/token/platform.go

+4-2
Original file line numberDiff line numberDiff line change
@@ -275,14 +275,16 @@ func (p *Platform) GenerateExtension(node *sfcnode.Node) {
275275

276276
func (p *Platform) StartSession(cmd *exec.Cmd, name string) (*gexec.Session, error) {
277277
ansiColorCode := p.nextColor()
278-
fmt.Fprintf(
278+
if _, err := fmt.Fprintf(
279279
ginkgo.GinkgoWriter,
280280
"\x1b[33m[d]\x1b[%s[%s]\x1b[0m starting %s %s\n",
281281
ansiColorCode,
282282
name,
283283
filepath.Base(cmd.Args[0]),
284284
strings.Join(cmd.Args[1:], " "),
285-
)
285+
); err != nil {
286+
return nil, err
287+
}
286288
return gexec.Start(
287289
cmd,
288290
gexec.NewPrefixedWriter(

‎integration/nwo/txgen/service/user/rest/user.go

+3-2
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ import (
1717
"strings"
1818
"time"
1919

20+
"github.com/hyperledger-labs/fabric-smart-client/platform/common/utils"
2021
"github.com/hyperledger-labs/fabric-token-sdk/integration/nwo/txgen/model"
2122
txgen "github.com/hyperledger-labs/fabric-token-sdk/integration/nwo/txgen/model/api"
2223
c "github.com/hyperledger-labs/fabric-token-sdk/integration/nwo/txgen/model/constants"
@@ -183,7 +184,7 @@ func (u *restUser) doRequest(request *http.Request, requestType c.ApiRequestType
183184
return nil, txgen.NewBadRequestError(err, "Can't make request")
184185
}
185186

186-
defer response.Body.Close()
187+
defer utils.CloseMute(response.Body)
187188
respBody, _ := io.ReadAll(response.Body)
188189

189190
if response.StatusCode >= http.StatusBadRequest {
@@ -227,7 +228,7 @@ func (u *restUser) authenticateUser() (string, txgen.Error) {
227228
return "", txgen.NewBadRequestError(err, "Can't make authentication request")
228229
}
229230

230-
defer response.Body.Close()
231+
defer utils.CloseMute(response.Body)
231232
respBody, _ := io.ReadAll(response.Body)
232233

233234
if response.StatusCode >= http.StatusBadRequest {

‎token/request.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import (
1010
"context"
1111

1212
"github.com/hyperledger-labs/fabric-smart-client/pkg/utils/proto"
13+
"github.com/hyperledger-labs/fabric-smart-client/platform/common/utils"
1314
"github.com/hyperledger-labs/fabric-smart-client/platform/view/services/hash"
1415
"github.com/hyperledger-labs/fabric-token-sdk/token/core/common/meta"
1516
"github.com/hyperledger-labs/fabric-token-sdk/token/driver"
@@ -1357,7 +1358,7 @@ func (r *Request) prepareTransfer(redeem bool, wallet *OwnerWallet, tokenType to
13571358
return nil, nil, errors.Wrapf(err, "failed to get selector manager")
13581359
}
13591360
selector, err = sm.NewSelector(r.Anchor)
1360-
defer sm.Close(r.Anchor)
1361+
defer utils.IgnoreError(sm.Close(r.Anchor))
13611362
if err != nil {
13621363
return nil, nil, errors.Wrapf(err, "failed getting default selector")
13631364
}

‎token/services/db/sql/common/tokenlock_test.go

+10-9
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import (
1111
"path"
1212
"testing"
1313

14+
"github.com/hyperledger-labs/fabric-smart-client/platform/common/utils"
1415
"github.com/hyperledger-labs/fabric-token-sdk/token/services/db/dbtest"
1516
"github.com/hyperledger-labs/fabric-token-sdk/token/services/db/sql/common"
1617
"github.com/hyperledger-labs/fabric-token-sdk/token/services/db/sql/driver/sql"
@@ -35,12 +36,12 @@ func TestTokenLockSqlite(t *testing.T) {
3536
MaxOpenConns: 10,
3637
}, sqlite.NewTransactionDB)
3738
if err != nil {
38-
tokenLockDB.Close()
39+
utils.CloseMute(tokenLockDB)
3940
t.Fatal(err)
4041
}
4142
t.Run(c.Name, func(xt *testing.T) {
42-
defer tokenLockDB.Close()
43-
defer tokenTransactionDB.Close()
43+
defer utils.CloseMute(tokenLockDB)
44+
defer utils.CloseMute(tokenTransactionDB)
4445
c.Fn(xt, tokenLockDB, tokenTransactionDB)
4546
})
4647
}
@@ -62,12 +63,12 @@ func TestTokenLockMemory(t *testing.T) {
6263
MaxOpenConns: 10,
6364
}, sqlite.NewTransactionDB)
6465
if err != nil {
65-
tokenLockDB.Close()
66+
utils.CloseMute(tokenLockDB)
6667
t.Fatal(err)
6768
}
6869
t.Run(c.Name, func(xt *testing.T) {
69-
defer tokenLockDB.Close()
70-
defer tokenTransactionDB.Close()
70+
defer utils.CloseMute(tokenLockDB)
71+
defer utils.CloseMute(tokenTransactionDB)
7172
c.Fn(xt, tokenLockDB, tokenTransactionDB)
7273
})
7374
}
@@ -92,12 +93,12 @@ func TestTokenLockPostgres(t *testing.T) {
9293
MaxOpenConns: 10,
9394
}, postgres.NewTransactionDB)
9495
if err != nil {
95-
tokenLockDB.Close()
96+
utils.CloseMute(tokenLockDB)
9697
t.Fatal(err)
9798
}
9899
t.Run(c.Name, func(xt *testing.T) {
99-
defer tokenLockDB.Close()
100-
defer tokenTransactionDB.Close()
100+
defer utils.CloseMute(tokenLockDB)
101+
defer utils.CloseMute(tokenTransactionDB)
101102
c.Fn(xt, tokenLockDB, tokenTransactionDB)
102103
})
103104
}

‎token/services/db/sql/common/transactions_test.go

+4-3
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import (
1111
"path"
1212
"testing"
1313

14+
"github.com/hyperledger-labs/fabric-smart-client/platform/common/utils"
1415
"github.com/hyperledger-labs/fabric-token-sdk/token/services/db/dbtest"
1516
"github.com/hyperledger-labs/fabric-token-sdk/token/services/db/sql/common"
1617
"github.com/hyperledger-labs/fabric-token-sdk/token/services/db/sql/driver/sql"
@@ -28,7 +29,7 @@ func TestTransactionsSqlite(t *testing.T) {
2829
t.Fatal(err)
2930
}
3031
t.Run(c.Name, func(xt *testing.T) {
31-
defer db.Close()
32+
defer utils.CloseMute(db)
3233
c.Fn(xt, db)
3334
})
3435
}
@@ -45,7 +46,7 @@ func TestTransactionsSqliteMemory(t *testing.T) {
4546
t.Fatal(err)
4647
}
4748
t.Run(c.Name, func(xt *testing.T) {
48-
defer db.Close()
49+
defer utils.CloseMute(db)
4950
c.Fn(xt, db)
5051
})
5152
}
@@ -65,7 +66,7 @@ func TestTransactionsPostgres(t *testing.T) {
6566
t.Fatal(err)
6667
}
6768
t.Run(c.Name, func(xt *testing.T) {
68-
defer db.Close()
69+
defer utils.CloseMute(db)
6970
c.Fn(xt, db)
7071
})
7172
}

‎token/services/identity/membership/lm.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ import (
1414
"sync"
1515

1616
errors2 "github.com/hyperledger-labs/fabric-smart-client/pkg/utils/errors"
17+
"github.com/hyperledger-labs/fabric-smart-client/platform/common/utils"
1718
"github.com/hyperledger-labs/fabric-smart-client/platform/common/utils/collections"
1819
"github.com/hyperledger-labs/fabric-smart-client/platform/view/services/hash"
1920
"github.com/hyperledger-labs/fabric-smart-client/platform/view/view"
@@ -493,7 +494,7 @@ func (l *LocalMembership) storedIdentityConfigurations() ([]idriver.IdentityConf
493494
if err != nil {
494495
return nil, errors2.WithMessagef(err, "failed to get registered identities from kvs")
495496
}
496-
defer it.Close()
497+
defer utils.CloseMute(it)
497498
// copy the iterator
498499
items := make([]idriver.IdentityConfiguration, 0)
499500
for it.HasNext() {

‎token/services/network/fabric/tcc/tcc_test.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import (
99
"encoding/base64"
1010
"os"
1111

12+
"github.com/hyperledger-labs/fabric-smart-client/platform/common/utils"
1213
chaincode2 "github.com/hyperledger-labs/fabric-token-sdk/token/services/network/fabric/tcc"
1314
"github.com/hyperledger-labs/fabric-token-sdk/token/services/network/fabric/tcc/mock"
1415
. "github.com/onsi/ginkgo/v2"
@@ -50,7 +51,7 @@ var _ = Describe("ccvalidator", func() {
5051
})
5152

5253
AfterEach(func() {
53-
os.Remove(ppFile.Name())
54+
utils.IgnoreError(os.Remove(ppFile.Name()))
5455
})
5556

5657
Describe("Init", func() {

‎token/services/selector/testutils/test_cases.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import (
1313
"sync/atomic"
1414
"testing"
1515

16+
"github.com/hyperledger-labs/fabric-smart-client/platform/common/utils"
1617
"github.com/hyperledger-labs/fabric-smart-client/platform/common/utils/collections"
1718
token2 "github.com/hyperledger-labs/fabric-token-sdk/token"
1819
"github.com/hyperledger-labs/fabric-token-sdk/token/services/db/driver"
@@ -201,7 +202,7 @@ func parallelSelect(t *testing.T, replicas []EnhancedManager, quantities []token
201202
sel, err := replica.NewSelector(txID)
202203
assert.NoError(t, err)
203204
go func() {
204-
defer replica.Close(txID)
205+
defer utils.IgnoreError(replica.Close(txID))
205206
tokens, sum, err := sel.Select(defaultTokenFilter, quantity.Hex(), defaultCurrency)
206207
if err != nil {
207208
errCh <- err

‎token/services/ttxdb/db/memory/memory_test.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ package memory
99
import (
1010
"testing"
1111

12+
"github.com/hyperledger-labs/fabric-smart-client/platform/common/utils"
1213
"github.com/hyperledger-labs/fabric-token-sdk/token"
1314
db2 "github.com/hyperledger-labs/fabric-token-sdk/token/services/db"
1415
"github.com/hyperledger-labs/fabric-token-sdk/token/services/db/dbtest"
@@ -24,7 +25,7 @@ func TestMemory(t *testing.T) {
2425
t.Fatal(err)
2526
}
2627
t.Run(c.Name, func(xt *testing.T) {
27-
defer db.Close()
28+
defer utils.CloseMute(db)
2829
c.Fn(xt, db)
2930
})
3031
}

0 commit comments

Comments
 (0)