Skip to content

Commit 0238698

Browse files
adecaroadecaro
committed
reduce lint errors
Signed-off-by: Angelo De Caro <angelo.decaro@gmail.com>
1 parent 720b5dd commit 0238698

File tree

34 files changed

+159
-157
lines changed

34 files changed

+159
-157
lines changed

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

+5-5
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import (
2424
"github.com/hyperledger-labs/fabric-token-sdk/integration/nwo/token/topology"
2525
"github.com/hyperledger-labs/fabric-token-sdk/token"
2626
"github.com/onsi/ginkgo/v2"
27-
. "github.com/onsi/gomega"
27+
"github.com/onsi/gomega"
2828
"github.com/onsi/gomega/gexec"
2929
"github.com/pkg/errors"
3030
"github.com/tedsuo/ifrit"
@@ -160,7 +160,7 @@ func (i *IdemixCASupport) Start() error {
160160
members := grouper.Members{}
161161
members = append(members, grouper.Member{Name: command.SessionName(), Runner: runner.New(config)})
162162
i.process = ifrit.Invoke(grouper.NewOrdered(syscall.SIGTERM, members))
163-
Eventually(i.process.Ready(), i.StartEventuallyTimeout).Should(BeClosed(), "fabric-ca-server didn't start timely")
163+
gomega.Eventually(i.process.Ready(), i.StartEventuallyTimeout).Should(gomega.BeClosed(), "fabric-ca-server didn't start timely")
164164

165165
// enroll admin
166166
caName := i.TMS.ID() + ".example.com"
@@ -176,7 +176,7 @@ func (i *IdemixCASupport) Start() error {
176176
if err != nil {
177177
return errors.Wrap(err, "failed to start admin enrollment")
178178
}
179-
Eventually(sess, i.EventuallyTimeout).Should(gexec.Exit(0))
179+
gomega.Eventually(sess, i.EventuallyTimeout).Should(gexec.Exit(0))
180180

181181
return nil
182182
}
@@ -217,7 +217,7 @@ func (i *IdemixCASupport) Gen(owner string) (res token.IdentityConfiguration, er
217217
if err != nil {
218218
return
219219
}
220-
Eventually(sess, i.EventuallyTimeout).Should(gexec.Exit(0))
220+
gomega.Eventually(sess, i.EventuallyTimeout).Should(gexec.Exit(0))
221221

222222
enrollCommand := &CAClientEnroll{
223223
Home: "",
@@ -232,7 +232,7 @@ func (i *IdemixCASupport) Gen(owner string) (res token.IdentityConfiguration, er
232232
if err != nil {
233233
return
234234
}
235-
Eventually(sess, i.EventuallyTimeout).Should(gexec.Exit(0))
235+
gomega.Eventually(sess, i.EventuallyTimeout).Should(gexec.Exit(0))
236236

237237
res.ID = owner
238238
res.URL = userOutput

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

+6-6
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import (
1717
sfcnode "github.com/hyperledger-labs/fabric-smart-client/integration/nwo/fsc/node"
1818
"github.com/hyperledger-labs/fabric-token-sdk/integration/nwo/token/generators"
1919
topology2 "github.com/hyperledger-labs/fabric-token-sdk/integration/nwo/token/topology"
20-
. "github.com/onsi/gomega"
20+
"github.com/onsi/gomega"
2121
"github.com/onsi/gomega/gexec"
2222
)
2323

@@ -82,22 +82,22 @@ func (p *NetworkHandler) DeleteDBs(node *sfcnode.Node) {
8282
for _, uniqueName := range node.ReplicaUniqueNames() {
8383
for _, path := range []string{p.TokensDBSQLDataSourceDir(uniqueName)} {
8484
logger.Infof("remove all [%s]", path)
85-
Expect(os.RemoveAll(path)).ToNot(HaveOccurred())
86-
Expect(os.MkdirAll(path, 0775)).ToNot(HaveOccurred(), "failed to create [%s]", path)
85+
gomega.Expect(os.RemoveAll(path)).ToNot(gomega.HaveOccurred())
86+
gomega.Expect(os.MkdirAll(path, 0775)).ToNot(gomega.HaveOccurred(), "failed to create [%s]", path)
8787
}
8888
}
8989
}
9090

9191
func (p *NetworkHandler) CopyDBsTo(node *sfcnode.Node, to string) {
92-
Expect(os.MkdirAll(to, 0775)).ToNot(HaveOccurred(), "failed to create [%s]", to)
92+
gomega.Expect(os.MkdirAll(to, 0775)).ToNot(gomega.HaveOccurred(), "failed to create [%s]", to)
9393
for _, uniqueName := range node.ReplicaUniqueNames() {
9494
for _, path := range []string{p.TokensDBSQLDataSourceDir(uniqueName), p.TTXDBSQLDataSourceDir(uniqueName)} {
9595
elements := filepath.SplitList(path)
9696
lastElement := elements[len(elements)-1]
9797
destination := filepath.Join(to, uniqueName, lastElement)
98-
Expect(os.MkdirAll(destination, 0775)).ToNot(HaveOccurred(), "failed to create [%s]", destination)
98+
gomega.Expect(os.MkdirAll(destination, 0775)).ToNot(gomega.HaveOccurred(), "failed to create [%s]", destination)
9999

100-
Expect(CopyDir(path, destination)).ToNot(HaveOccurred(), "failed to copy [%s] to [%s]", path, destination)
100+
gomega.Expect(CopyDir(path, destination)).ToNot(gomega.HaveOccurred(), "failed to copy [%s] to [%s]", path, destination)
101101
}
102102
}
103103
}

‎integration/nwo/token/fabric/cc/tcc.go

+11-11
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import (
2323
common2 "github.com/hyperledger-labs/fabric-token-sdk/integration/nwo/token/common"
2424
topology3 "github.com/hyperledger-labs/fabric-token-sdk/integration/nwo/token/topology"
2525
"github.com/hyperledger-labs/fabric-token-sdk/token/services/logging"
26-
. "github.com/onsi/gomega"
26+
"github.com/onsi/gomega"
2727
)
2828

2929
const (
@@ -65,7 +65,7 @@ func (p *GenericBackend) PrepareNamespace(tms *topology3.TMS) {
6565
return
6666
}
6767
orgs, ok := tms.BackendParams["fabric.orgs"].([]string)
68-
Expect(ok).To(BeTrue(), "missing orgs for tms [%s:%s:%s:%s:%s]", tms.Network, tms.Channel, tms.Namespace, tms.Driver, tms.Alias)
68+
gomega.Expect(ok).To(gomega.BeTrue(), "missing orgs for tms [%s:%s:%s:%s:%s]", tms.Network, tms.Channel, tms.Namespace, tms.Driver, tms.Alias)
6969

7070
// Standard Chaincode
7171
policy := "AND ("
@@ -112,7 +112,7 @@ func (p *GenericBackend) UpdatePublicParams(tms *topology3.TMS, ppRaw []byte) {
112112
break
113113
}
114114
}
115-
Expect(cc).NotTo(BeNil(), "failed to find chaincode [%s]", tms.Namespace)
115+
gomega.Expect(cc).NotTo(gomega.BeNil(), "failed to find chaincode [%s]", tms.Namespace)
116116

117117
packageDir := filepath.Join(
118118
p.TokenPlatform.GetContext().RootDir(),
@@ -128,7 +128,7 @@ func (p *GenericBackend) UpdatePublicParams(tms *topology3.TMS, ppRaw []byte) {
128128
packageDir,
129129
cc.Chaincode.Name+newChaincodeVersion+".tar.gz",
130130
)
131-
Expect(os.MkdirAll(packageDir, 0766)).ToNot(HaveOccurred())
131+
gomega.Expect(os.MkdirAll(packageDir, 0766)).ToNot(gomega.HaveOccurred())
132132

133133
paramsFile := PublicParamsTemplate(ppRaw)
134134

@@ -145,7 +145,7 @@ func (p *GenericBackend) UpdatePublicParams(tms *topology3.TMS, ppRaw []byte) {
145145
return "", nil
146146
},
147147
)
148-
Expect(err).ToNot(HaveOccurred())
148+
gomega.Expect(err).ToNot(gomega.HaveOccurred())
149149
cc.Chaincode.PackageFile = packageFile
150150
p.Fabric(tms).UpdateChaincode(cc.Chaincode.Name,
151151
newChaincodeVersion,
@@ -156,7 +156,7 @@ func (p *GenericBackend) tccSetup(tms *topology3.TMS, cc *topology.ChannelChainc
156156
// Load public parameters
157157
logger.Debugf("tcc setup, reading public parameters from [%s]", p.TokenPlatform.PublicParametersFile(tms))
158158
ppRaw, err := os.ReadFile(p.TokenPlatform.PublicParametersFile(tms))
159-
Expect(err).ToNot(HaveOccurred())
159+
gomega.Expect(err).ToNot(gomega.HaveOccurred())
160160

161161
// produce chaincode package
162162
packageDir := filepath.Join(
@@ -172,7 +172,7 @@ func (p *GenericBackend) tccSetup(tms *topology3.TMS, cc *topology.ChannelChainc
172172
packageDir,
173173
cc.Chaincode.Name+".tar.gz",
174174
)
175-
Expect(os.MkdirAll(packageDir, 0766)).ToNot(HaveOccurred())
175+
gomega.Expect(os.MkdirAll(packageDir, 0766)).ToNot(gomega.HaveOccurred())
176176
paramsFile := PublicParamsTemplate(ppRaw)
177177
port := p.TokenPlatform.GetContext().ReservePort()
178178
err = packager.New().PackageChaincode(
@@ -210,7 +210,7 @@ func (p *GenericBackend) tccSetup(tms *topology3.TMS, cc *topology.ChannelChainc
210210
return "", nil
211211
},
212212
)
213-
Expect(err).ToNot(HaveOccurred())
213+
gomega.Expect(err).ToNot(gomega.HaveOccurred())
214214

215215
cc.Chaincode.Ctor = `{"Args":["init"]}`
216216
cc.Chaincode.PackageFile = packageFile
@@ -221,7 +221,7 @@ func (p *GenericBackend) tccSetup(tms *topology3.TMS, cc *topology.ChannelChainc
221221
func (p *GenericBackend) TCCCtor(tms *topology3.TMS) string {
222222
logger.Debugf("tcc setup, reading public parameters for setting up CTOR [%s]", p.TokenPlatform.PublicParametersFile(tms))
223223
ppRaw, err := os.ReadFile(p.TokenPlatform.PublicParametersFile(tms))
224-
Expect(err).ToNot(HaveOccurred())
224+
gomega.Expect(err).ToNot(gomega.HaveOccurred())
225225

226226
return fmt.Sprintf(`{"Args":["init", "%s"]}`, base64.StdEncoding.EncodeToString(ppRaw))
227227
}
@@ -238,9 +238,9 @@ func PublicParamsTemplate(ppRaw []byte) *bytes.Buffer {
238238
t, err := template.New("node").Funcs(template.FuncMap{
239239
"Params": func() string { return base64.StdEncoding.EncodeToString(ppRaw) },
240240
}).Parse(pp2.DefaultParams)
241-
Expect(err).ToNot(HaveOccurred())
241+
gomega.Expect(err).ToNot(gomega.HaveOccurred())
242242
paramsFile := bytes.NewBuffer(nil)
243243
err = t.Execute(io.MultiWriter(paramsFile), nil)
244-
Expect(err).ToNot(HaveOccurred())
244+
gomega.Expect(err).ToNot(gomega.HaveOccurred())
245245
return paramsFile
246246
}

‎integration/nwo/token/fabric/fabric.go

+20-20
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import (
2525
topology2 "github.com/hyperledger-labs/fabric-token-sdk/integration/nwo/token/topology"
2626
"github.com/hyperledger-labs/fabric-token-sdk/token"
2727
"github.com/hyperledger-labs/fabric-token-sdk/token/services/logging"
28-
. "github.com/onsi/gomega"
28+
"github.com/onsi/gomega"
2929
)
3030

3131
var logger = logging.MustGetLogger("token-sdk.integration.token.fabric")
@@ -70,11 +70,11 @@ func (p *NetworkHandler) GenerateArtifacts(tms *topology2.TMS) {
7070

7171
// Generate crypto material
7272
cmGenerator := p.CryptoMaterialGenerators[tms.Driver]
73-
Expect(cmGenerator).NotTo(BeNil(), "Crypto material generator for driver %s not found", tms.Driver)
73+
gomega.Expect(cmGenerator).NotTo(gomega.BeNil(), "Crypto material generator for driver %s not found", tms.Driver)
7474

7575
// - Setup
7676
root, err := cmGenerator.Setup(tms)
77-
Expect(err).NotTo(HaveOccurred())
77+
gomega.Expect(err).NotTo(gomega.HaveOccurred())
7878

7979
// - Generate crypto material for each FSC node
8080
fscTopology := p.TokenPlatform.GetContext().TopologyByName(fsc.TopologyName).(*fsc.Topology)
@@ -85,7 +85,7 @@ func (p *NetworkHandler) GenerateArtifacts(tms *topology2.TMS) {
8585
// Generate public parameters
8686
var ppRaw []byte
8787
ppGenerator := p.TokenPlatform.GetPublicParamsGenerators(tms.Driver)
88-
Expect(ppGenerator).NotTo(BeNil(), "No public params generator for driver %s", tms.Driver)
88+
gomega.Expect(ppGenerator).NotTo(gomega.BeNil(), "No public params generator for driver %s", tms.Driver)
8989
args := []interface{}{root}
9090
for _, arg := range tms.PublicParamsGenArgs {
9191
args = append(args, arg)
@@ -99,11 +99,11 @@ func (p *NetworkHandler) GenerateArtifacts(tms *topology2.TMS) {
9999
wallets.Certifiers = append(wallets.Certifiers, w.Certifiers...)
100100
}
101101
ppRaw, err = ppGenerator.Generate(tms, wallets, args...)
102-
Expect(err).ToNot(HaveOccurred())
102+
gomega.Expect(err).ToNot(gomega.HaveOccurred())
103103

104104
// - Store pp
105-
Expect(os.MkdirAll(p.TokenPlatform.PublicParametersDir(), 0766)).ToNot(HaveOccurred())
106-
Expect(os.WriteFile(p.TokenPlatform.PublicParametersFile(tms), ppRaw, 0766)).ToNot(HaveOccurred())
105+
gomega.Expect(os.MkdirAll(p.TokenPlatform.PublicParametersDir(), 0766)).ToNot(gomega.HaveOccurred())
106+
gomega.Expect(os.WriteFile(p.TokenPlatform.PublicParametersFile(tms), ppRaw, 0766)).ToNot(gomega.HaveOccurred())
107107

108108
// Prepare namespace
109109
p.Backend.PrepareNamespace(tms)
@@ -113,17 +113,17 @@ func (p *NetworkHandler) GenerateArtifacts(tms *topology2.TMS) {
113113
caFactory, found := p.CASupports[tms.Driver]
114114
if found {
115115
ca, err := caFactory(p.TokenPlatform, tms, root)
116-
Expect(err).ToNot(HaveOccurred(), "failed to instantiate CA for [%s]", tms.ID())
116+
gomega.Expect(err).ToNot(gomega.HaveOccurred(), "failed to instantiate CA for [%s]", tms.ID())
117117
entry.CA = ca
118118
}
119119
}
120120
}
121121

122122
func (p *NetworkHandler) GenerateExtension(tms *topology2.TMS, node *sfcnode.Node, uniqueName string) string {
123-
Expect(os.MkdirAll(p.TTXDBSQLDataSourceDir(uniqueName), 0775)).ToNot(HaveOccurred(), "failed to create [%s]", p.TTXDBSQLDataSourceDir(uniqueName))
124-
Expect(os.MkdirAll(p.TokensDBSQLDataSourceDir(uniqueName), 0775)).ToNot(HaveOccurred(), "failed to create [%s]", p.TokensDBSQLDataSourceDir(uniqueName))
125-
Expect(os.MkdirAll(p.AuditDBSQLDataSourceDir(uniqueName), 0775)).ToNot(HaveOccurred(), "failed to create [%s]", p.AuditDBSQLDataSourceDir(uniqueName))
126-
Expect(os.MkdirAll(p.IdentityDBSQLDataSourceDir(uniqueName), 0775)).ToNot(HaveOccurred(), "failed to create [%s]", p.IdentityDBSQLDataSourceDir(uniqueName))
123+
gomega.Expect(os.MkdirAll(p.TTXDBSQLDataSourceDir(uniqueName), 0775)).ToNot(gomega.HaveOccurred(), "failed to create [%s]", p.TTXDBSQLDataSourceDir(uniqueName))
124+
gomega.Expect(os.MkdirAll(p.TokensDBSQLDataSourceDir(uniqueName), 0775)).ToNot(gomega.HaveOccurred(), "failed to create [%s]", p.TokensDBSQLDataSourceDir(uniqueName))
125+
gomega.Expect(os.MkdirAll(p.AuditDBSQLDataSourceDir(uniqueName), 0775)).ToNot(gomega.HaveOccurred(), "failed to create [%s]", p.AuditDBSQLDataSourceDir(uniqueName))
126+
gomega.Expect(os.MkdirAll(p.IdentityDBSQLDataSourceDir(uniqueName), 0775)).ToNot(gomega.HaveOccurred(), "failed to create [%s]", p.IdentityDBSQLDataSourceDir(uniqueName))
127127

128128
persistence := node.Options.GetPersistence("token")
129129
if persistence == nil {
@@ -144,11 +144,11 @@ func (p *NetworkHandler) GenerateExtension(tms *topology2.TMS, node *sfcnode.Nod
144144
"Endorser": func() bool { return topology2.ToOptions(node.Options).Endorser() },
145145
"OnlyUnity": func() bool { return common2.IsOnlyUnity(tms) },
146146
}).Parse(Extension)
147-
Expect(err).NotTo(HaveOccurred())
147+
gomega.Expect(err).NotTo(gomega.HaveOccurred())
148148

149149
ext := bytes.NewBufferString("")
150150
err = t.Execute(io.MultiWriter(ext), p)
151-
Expect(err).NotTo(HaveOccurred())
151+
gomega.Expect(err).NotTo(gomega.HaveOccurred())
152152

153153
return ext.String()
154154
}
@@ -168,7 +168,7 @@ func (p *NetworkHandler) PostRun(load bool, tms *topology2.TMS) {
168168
// Start the CA, if available
169169
entry := p.GetEntry(tms)
170170
if entry.CA != nil {
171-
Expect(entry.CA.Start()).ToNot(HaveOccurred(), "failed to start CA for [%s]", tms.ID())
171+
gomega.Expect(entry.CA.Start()).ToNot(gomega.HaveOccurred(), "failed to start CA for [%s]", tms.ID())
172172
}
173173
}
174174
}
@@ -187,7 +187,7 @@ func (p *NetworkHandler) UpdatePublicParams(tms *topology2.TMS, ppRaw []byte) {
187187

188188
func (p *NetworkHandler) GenIssuerCryptoMaterial(tms *topology2.TMS, nodeID string, walletID string) string {
189189
cmGenerator := p.CryptoMaterialGenerators[tms.Driver]
190-
Expect(cmGenerator).NotTo(BeNil(), "Crypto material generator for driver %s not found", tms.Driver)
190+
gomega.Expect(cmGenerator).NotTo(gomega.BeNil(), "Crypto material generator for driver %s not found", tms.Driver)
191191

192192
fscTopology := p.TokenPlatform.GetContext().TopologyByName(fsc.TopologyName).(*fsc.Topology)
193193
for _, node := range fscTopology.Nodes {
@@ -196,7 +196,7 @@ func (p *NetworkHandler) GenIssuerCryptoMaterial(tms *topology2.TMS, nodeID stri
196196
return ids[0].Path
197197
}
198198
}
199-
Expect(false).To(BeTrue(), "cannot find FSC node [%s:%s]", tms.Network, nodeID)
199+
gomega.Expect(false).To(gomega.BeTrue(), "cannot find FSC node [%s:%s]", tms.Network, nodeID)
200200
return ""
201201
}
202202

@@ -209,14 +209,14 @@ func (p *NetworkHandler) GenOwnerCryptoMaterial(tms *topology2.TMS, nodeID strin
209209
// return the path where the credential is stored
210210
logger.Infof("generate owner crypto material using ca")
211211
ic, err := ca.Gen(walletID)
212-
Expect(err).ToNot(HaveOccurred(), "failed to generate owner crypto material using ca [%s]", tms.ID())
212+
gomega.Expect(err).ToNot(gomega.HaveOccurred(), "failed to generate owner crypto material using ca [%s]", tms.ID())
213213
return ic
214214
}
215215
// continue without the ca
216216
}
217217

218218
cmGenerator := p.CryptoMaterialGenerators[tms.Driver]
219-
Expect(cmGenerator).NotTo(BeNil(), "Crypto material generator for driver %s not found", tms.Driver)
219+
gomega.Expect(cmGenerator).NotTo(gomega.BeNil(), "Crypto material generator for driver %s not found", tms.Driver)
220220

221221
fscTopology := p.TokenPlatform.GetContext().TopologyByName(fsc.TopologyName).(*fsc.Topology)
222222
for _, node := range fscTopology.Nodes {
@@ -228,7 +228,7 @@ func (p *NetworkHandler) GenOwnerCryptoMaterial(tms *topology2.TMS, nodeID strin
228228
return
229229
}
230230
}
231-
Expect(false).To(BeTrue(), "cannot find FSC node [%s:%s]", tms.Network, nodeID)
231+
gomega.Expect(false).To(gomega.BeTrue(), "cannot find FSC node [%s:%s]", tms.Network, nodeID)
232232
return
233233
}
234234

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

+9-9
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ import (
2828
"github.com/hyperledger-labs/fabric-token-sdk/token/services/identity/idemix/crypto/protos-go/config"
2929
"github.com/hyperledger-labs/fabric-token-sdk/token/services/logging"
3030
"github.com/onsi/ginkgo/v2"
31-
. "github.com/onsi/gomega"
31+
"github.com/onsi/gomega"
3232
"github.com/onsi/gomega/gexec"
3333
)
3434

@@ -98,7 +98,7 @@ func (d *CryptoMaterialGenerator) Setup(tms *topology.TMS) (string, error) {
9898
if err != nil {
9999
return "", err
100100
}
101-
Eventually(sess, d.EventuallyTimeout).Should(gexec.Exit(0))
101+
gomega.Eventually(sess, d.EventuallyTimeout).Should(gexec.Exit(0))
102102
return output, nil
103103
}
104104

@@ -142,19 +142,19 @@ func (d *CryptoMaterialGenerator) GenerateOwnerIdentities(tms *topology.TMS, n *
142142
Curve: curveID,
143143
Aries: IsAries(tms),
144144
})
145-
Expect(err).NotTo(HaveOccurred())
146-
Eventually(sess, d.EventuallyTimeout).Should(gexec.Exit(0))
145+
gomega.Expect(err).NotTo(gomega.HaveOccurred())
146+
gomega.Eventually(sess, d.EventuallyTimeout).Should(gexec.Exit(0))
147147

148148
if remote {
149149
// Prepare a folder for the remote wallet
150150
// This is done by stripping out Cred and Sk from the SignerConfig
151151
signerBytes, err := os.ReadFile(filepath.Join(userOutput, idemix.IdemixConfigDirUser, idemix.IdemixConfigFileSigner))
152-
Expect(err).NotTo(HaveOccurred())
152+
gomega.Expect(err).NotTo(gomega.HaveOccurred())
153153

154154
// nullify cred and sk
155155
signerConfig := &config.IdemixSignerConfig{}
156156
err = proto.Unmarshal(signerBytes, signerConfig)
157-
Expect(err).NotTo(HaveOccurred())
157+
gomega.Expect(err).NotTo(gomega.HaveOccurred())
158158
signerConfig.Cred = nil
159159
signerConfig.Sk = nil
160160

@@ -164,18 +164,18 @@ func (d *CryptoMaterialGenerator) GenerateOwnerIdentities(tms *topology.TMS, n *
164164
signerBytes,
165165
0766,
166166
)
167-
Expect(err).NotTo(HaveOccurred())
167+
gomega.Expect(err).NotTo(gomega.HaveOccurred())
168168

169169
// overwrite the signer config file so that the token-sdk will interpreter this wallet as a remote one or verify only wallet
170170
raw, err := proto.Marshal(signerConfig)
171-
Expect(err).NotTo(HaveOccurred())
171+
gomega.Expect(err).NotTo(gomega.HaveOccurred())
172172

173173
err = os.WriteFile(
174174
filepath.Join(userOutput, idemix.IdemixConfigDirUser, idemix.IdemixConfigFileSigner),
175175
raw,
176176
0766,
177177
)
178-
Expect(err).NotTo(HaveOccurred())
178+
gomega.Expect(err).NotTo(gomega.HaveOccurred())
179179
}
180180
res = append(res, topology.Identity{
181181
ID: owner,

0 commit comments

Comments
 (0)