Skip to content

Commit b66e25e

Browse files
dhrubabasudhrubabasu
authored
Enforce inlining functions with a single error return in require.NoError (#1500)
1 parent 7403188 commit b66e25e

File tree

100 files changed

+1230
-2329
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

100 files changed

+1230
-2329
lines changed

‎api/admin/service_test.go‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -75,10 +75,8 @@ func TestLoadVMsSuccess(t *testing.T) {
7575

7676
// execute test
7777
reply := LoadVMsReply{}
78-
err := resources.admin.LoadVMs(&http.Request{}, nil, &reply)
79-
78+
require.NoError(resources.admin.LoadVMs(&http.Request{}, nil, &reply))
8079
require.Equal(expectedVMRegistry, reply.NewVMs)
81-
require.NoError(err)
8280
}
8381

8482
// Tests behavior for LoadVMs if we fail to reload vms.

‎api/auth/auth_test.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -144,8 +144,7 @@ func TestRevokeToken(t *testing.T) {
144144
tokenStr, err := auth.NewToken(testPassword, defaultTokenLifespan, endpoints)
145145
require.NoError(err)
146146

147-
err = auth.RevokeToken(tokenStr, testPassword)
148-
require.NoError(err)
147+
require.NoError(auth.RevokeToken(tokenStr, testPassword))
149148
require.Len(auth.revoked, 1)
150149
}
151150

‎api/health/health_test.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -247,9 +247,8 @@ func TestDeadlockRegression(t *testing.T) {
247247

248248
for i := 0; i < 1000; i++ {
249249
lock.Lock()
250-
err = h.RegisterHealthCheck(fmt.Sprintf("check-%d", i), check)
250+
require.NoError(h.RegisterHealthCheck(fmt.Sprintf("check-%d", i), check))
251251
lock.Unlock()
252-
require.NoError(err)
253252
}
254253

255254
awaitHealthy(t, h, true)

‎api/keystore/service_test.go‎

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,10 @@ func TestServiceCreateUser(t *testing.T) {
4040
s := service{ks: ks.(*keystore)}
4141

4242
{
43-
err := s.CreateUser(nil, &api.UserPass{
43+
require.NoError(s.CreateUser(nil, &api.UserPass{
4444
Username: "bob",
4545
Password: strongPassword,
46-
}, &api.EmptyReply{})
47-
require.NoError(err)
46+
}, &api.EmptyReply{}))
4847
}
4948

5049
{
@@ -123,11 +122,10 @@ func TestServiceCreateDuplicate(t *testing.T) {
123122
s := service{ks: ks.(*keystore)}
124123

125124
{
126-
err := s.CreateUser(nil, &api.UserPass{
125+
require.NoError(s.CreateUser(nil, &api.UserPass{
127126
Username: "bob",
128127
Password: strongPassword,
129-
}, &api.EmptyReply{})
130-
require.NoError(err)
128+
}, &api.EmptyReply{}))
131129
}
132130

133131
{
@@ -161,11 +159,10 @@ func TestServiceUseBlockchainDB(t *testing.T) {
161159
s := service{ks: ks.(*keystore)}
162160

163161
{
164-
err := s.CreateUser(nil, &api.UserPass{
162+
require.NoError(s.CreateUser(nil, &api.UserPass{
165163
Username: "bob",
166164
Password: strongPassword,
167-
}, &api.EmptyReply{})
168-
require.NoError(err)
165+
}, &api.EmptyReply{}))
169166
}
170167

171168
{
@@ -193,11 +190,10 @@ func TestServiceExportImport(t *testing.T) {
193190
s := service{ks: ks.(*keystore)}
194191

195192
{
196-
err := s.CreateUser(nil, &api.UserPass{
193+
require.NoError(s.CreateUser(nil, &api.UserPass{
197194
Username: "bob",
198195
Password: strongPassword,
199-
}, &api.EmptyReply{})
200-
require.NoError(err)
196+
}, &api.EmptyReply{}))
201197
}
202198

203199
{
@@ -243,15 +239,14 @@ func TestServiceExportImport(t *testing.T) {
243239
}
244240

245241
{
246-
err := newS.ImportUser(nil, &ImportUserArgs{
242+
require.NoError(newS.ImportUser(nil, &ImportUserArgs{
247243
UserPass: api.UserPass{
248244
Username: "bob",
249245
Password: strongPassword,
250246
},
251247
User: exportReply.User,
252248
Encoding: encoding,
253-
}, &api.EmptyReply{})
254-
require.NoError(err)
249+
}, &api.EmptyReply{}))
255250
}
256251

257252
{

‎chains/atomic/gsharedmemory/shared_memory_test.go‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,8 @@ func TestInterface(t *testing.T) {
3737

3838
test(t, chainID0, chainID1, sm0, sm1, testDB)
3939

40-
err := conn0.Close()
41-
require.NoError(err)
42-
43-
err = conn1.Close()
44-
require.NoError(err)
40+
require.NoError(conn0.Close())
41+
require.NoError(conn1.Close())
4542
}
4643
}
4744

‎chains/atomic/test_shared_memory.go‎

Lines changed: 39 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,10 @@ var SharedMemoryTests = []func(t *testing.T, chainID0, chainID1 ids.ID, sm0, sm1
3131
func TestSharedMemoryPutAndGet(t *testing.T, chainID0, chainID1 ids.ID, sm0, sm1 SharedMemory, _ database.Database) {
3232
require := require.New(t)
3333

34-
err := sm0.Apply(map[ids.ID]*Requests{chainID1: {PutRequests: []*Element{{
34+
require.NoError(sm0.Apply(map[ids.ID]*Requests{chainID1: {PutRequests: []*Element{{
3535
Key: []byte{0},
3636
Value: []byte{1},
37-
}}}})
38-
39-
require.NoError(err)
37+
}}}}))
4038

4139
values, err := sm1.Get(chainID0, [][]byte{{0}})
4240
require.NoError(err)
@@ -73,12 +71,11 @@ func TestSharedMemoryLargePutGetAndRemove(t *testing.T, chainID0, chainID1 ids.I
7371
keys = append(keys, key)
7472
}
7573

76-
err = sm0.Apply(map[ids.ID]*Requests{
74+
require.NoError(sm0.Apply(map[ids.ID]*Requests{
7775
chainID1: {
7876
PutRequests: elems,
7977
},
80-
})
81-
require.NoError(err)
78+
}))
8279

8380
values, err := sm1.Get(
8481
chainID0,
@@ -89,37 +86,33 @@ func TestSharedMemoryLargePutGetAndRemove(t *testing.T, chainID0, chainID1 ids.I
8986
require.Equal(elems[i].Value, value)
9087
}
9188

92-
err = sm1.Apply(map[ids.ID]*Requests{
89+
require.NoError(sm1.Apply(map[ids.ID]*Requests{
9390
chainID0: {
9491
RemoveRequests: keys,
9592
},
96-
})
97-
98-
require.NoError(err)
93+
}))
9994
}
10095

10196
func TestSharedMemoryIndexed(t *testing.T, chainID0, chainID1 ids.ID, sm0, sm1 SharedMemory, _ database.Database) {
10297
require := require.New(t)
10398

104-
err := sm0.Apply(map[ids.ID]*Requests{chainID1: {PutRequests: []*Element{{
99+
require.NoError(sm0.Apply(map[ids.ID]*Requests{chainID1: {PutRequests: []*Element{{
105100
Key: []byte{0},
106101
Value: []byte{1},
107102
Traits: [][]byte{
108103
{2},
109104
{3},
110105
},
111-
}}}})
112-
require.NoError(err)
106+
}}}}))
113107

114-
err = sm0.Apply(map[ids.ID]*Requests{chainID1: {PutRequests: []*Element{{
108+
require.NoError(sm0.Apply(map[ids.ID]*Requests{chainID1: {PutRequests: []*Element{{
115109
Key: []byte{4},
116110
Value: []byte{5},
117111
Traits: [][]byte{
118112
{2},
119113
{3},
120114
},
121-
}}}})
122-
require.NoError(err)
115+
}}}}))
123116

124117
values, _, _, err := sm0.Indexed(chainID1, [][]byte{{2}}, nil, nil, 1)
125118
require.NoError(err)
@@ -183,8 +176,7 @@ func TestSharedMemoryLargeIndexed(t *testing.T, chainID0, chainID1 ids.ID, sm0,
183176
})
184177
}
185178

186-
err = sm0.Apply(map[ids.ID]*Requests{chainID1: {PutRequests: elems}})
187-
require.NoError(err)
179+
require.NoError(sm0.Apply(map[ids.ID]*Requests{chainID1: {PutRequests: elems}}))
188180

189181
values, _, _, err := sm1.Indexed(chainID0, allTraits, nil, nil, len(elems)+1)
190182
require.NoError(err)
@@ -207,11 +199,10 @@ func TestSharedMemoryCantDuplicatePut(t *testing.T, _, chainID1 ids.ID, sm0, _ S
207199
// TODO: require error to be errDuplicatedOperation
208200
require.Error(err) //nolint:forbidigo // currently returns grpc errors too
209201

210-
err = sm0.Apply(map[ids.ID]*Requests{chainID1: {PutRequests: []*Element{{
202+
require.NoError(sm0.Apply(map[ids.ID]*Requests{chainID1: {PutRequests: []*Element{{
211203
Key: []byte{0},
212204
Value: []byte{1},
213-
}}}})
214-
require.NoError(err)
205+
}}}}))
215206

216207
err = sm0.Apply(map[ids.ID]*Requests{chainID1: {PutRequests: []*Element{{
217208
Key: []byte{0},
@@ -224,36 +215,31 @@ func TestSharedMemoryCantDuplicatePut(t *testing.T, _, chainID1 ids.ID, sm0, _ S
224215
func TestSharedMemoryCantDuplicateRemove(t *testing.T, _, chainID1 ids.ID, sm0, _ SharedMemory, _ database.Database) {
225216
require := require.New(t)
226217

227-
err := sm0.Apply(map[ids.ID]*Requests{chainID1: {RemoveRequests: [][]byte{{0}}}})
228-
require.NoError(err)
218+
require.NoError(sm0.Apply(map[ids.ID]*Requests{chainID1: {RemoveRequests: [][]byte{{0}}}}))
229219

230-
err = sm0.Apply(map[ids.ID]*Requests{chainID1: {RemoveRequests: [][]byte{{0}}}})
220+
err := sm0.Apply(map[ids.ID]*Requests{chainID1: {RemoveRequests: [][]byte{{0}}}})
231221
// TODO: require error to be errDuplicatedOperation
232222
require.Error(err) //nolint:forbidigo // currently returns grpc errors too
233223
}
234224

235225
func TestSharedMemoryCommitOnPut(t *testing.T, _, chainID1 ids.ID, sm0, _ SharedMemory, db database.Database) {
236226
require := require.New(t)
237227

238-
err := db.Put([]byte{1}, []byte{2})
239-
require.NoError(err)
228+
require.NoError(db.Put([]byte{1}, []byte{2}))
240229

241230
batch := db.NewBatch()
242231

243-
err = batch.Put([]byte{0}, []byte{1})
244-
require.NoError(err)
232+
require.NoError(batch.Put([]byte{0}, []byte{1}))
245233

246-
err = batch.Delete([]byte{1})
247-
require.NoError(err)
234+
require.NoError(batch.Delete([]byte{1}))
248235

249-
err = sm0.Apply(
236+
require.NoError(sm0.Apply(
250237
map[ids.ID]*Requests{chainID1: {PutRequests: []*Element{{
251238
Key: []byte{0},
252239
Value: []byte{1},
253240
}}}},
254241
batch,
255-
)
256-
require.NoError(err)
242+
))
257243

258244
val, err := db.Get([]byte{0})
259245
require.NoError(err)
@@ -267,22 +253,18 @@ func TestSharedMemoryCommitOnPut(t *testing.T, _, chainID1 ids.ID, sm0, _ Shared
267253
func TestSharedMemoryCommitOnRemove(t *testing.T, _, chainID1 ids.ID, sm0, _ SharedMemory, db database.Database) {
268254
require := require.New(t)
269255

270-
err := db.Put([]byte{1}, []byte{2})
271-
require.NoError(err)
256+
require.NoError(db.Put([]byte{1}, []byte{2}))
272257

273258
batch := db.NewBatch()
274259

275-
err = batch.Put([]byte{0}, []byte{1})
276-
require.NoError(err)
260+
require.NoError(batch.Put([]byte{0}, []byte{1}))
277261

278-
err = batch.Delete([]byte{1})
279-
require.NoError(err)
262+
require.NoError(batch.Delete([]byte{1}))
280263

281-
err = sm0.Apply(
264+
require.NoError(sm0.Apply(
282265
map[ids.ID]*Requests{chainID1: {RemoveRequests: [][]byte{{0}}}},
283266
batch,
284-
)
285-
require.NoError(err)
267+
))
286268

287269
val, err := db.Get([]byte{0})
288270
require.NoError(err)
@@ -299,8 +281,7 @@ func TestPutAndRemoveBatch(t *testing.T, chainID0, _ ids.ID, _, sm1 SharedMemory
299281

300282
batch := db.NewBatch()
301283

302-
err := batch.Put([]byte{0}, []byte{1})
303-
require.NoError(err)
284+
require.NoError(batch.Put([]byte{0}, []byte{1}))
304285

305286
batchChainsAndInputs := make(map[ids.ID]*Requests)
306287

@@ -314,9 +295,7 @@ func TestPutAndRemoveBatch(t *testing.T, chainID0, _ ids.ID, _, sm1 SharedMemory
314295
RemoveRequests: byteArr,
315296
}
316297

317-
err = sm1.Apply(batchChainsAndInputs, batch)
318-
319-
require.NoError(err)
298+
require.NoError(sm1.Apply(batchChainsAndInputs, batch))
320299

321300
val, err := db.Get([]byte{0})
322301
require.NoError(err)
@@ -348,24 +327,19 @@ func TestSharedMemoryLargeBatchSize(t *testing.T, _, chainID1 ids.ID, sm0, _ Sha
348327
value := bytes[:elementSize]
349328
bytes = bytes[elementSize:]
350329

351-
err := batch.Put(key, value)
352-
require.NoError(err)
330+
require.NoError(batch.Put(key, value))
353331
}
354332

355-
err = db.Put([]byte{1}, []byte{2})
356-
require.NoError(err)
333+
require.NoError(db.Put([]byte{1}, []byte{2}))
357334

358-
err = batch.Put([]byte{0}, []byte{1})
359-
require.NoError(err)
335+
require.NoError(batch.Put([]byte{0}, []byte{1}))
360336

361-
err = batch.Delete([]byte{1})
362-
require.NoError(err)
337+
require.NoError(batch.Delete([]byte{1}))
363338

364-
err = sm0.Apply(
339+
require.NoError(sm0.Apply(
365340
map[ids.ID]*Requests{chainID1: {RemoveRequests: [][]byte{{0}}}},
366341
batch,
367-
)
368-
require.NoError(err)
342+
))
369343

370344
val, err := db.Get([]byte{0})
371345
require.NoError(err)
@@ -382,16 +356,13 @@ func TestSharedMemoryLargeBatchSize(t *testing.T, _, chainID1 ids.ID, sm0, _ Sha
382356
key := bytes[:elementSize]
383357
bytes = bytes[pairSize:]
384358

385-
err := batch.Delete(key)
386-
require.NoError(err)
359+
require.NoError(batch.Delete(key))
387360
}
388361

389-
err = sm0.Apply(
362+
require.NoError(sm0.Apply(
390363
map[ids.ID]*Requests{chainID1: {RemoveRequests: [][]byte{{1}}}},
391364
batch,
392-
)
393-
394-
require.NoError(err)
365+
))
395366

396367
batch.Reset()
397368

@@ -400,8 +371,7 @@ func TestSharedMemoryLargeBatchSize(t *testing.T, _, chainID1 ids.ID, sm0, _ Sha
400371
key := bytes[:elementSize]
401372
bytes = bytes[pairSize:]
402373

403-
err := batch.Delete(key)
404-
require.NoError(err)
374+
require.NoError(batch.Delete(key))
405375
}
406376

407377
batchChainsAndInputs := make(map[ids.ID]*Requests)
@@ -416,9 +386,8 @@ func TestSharedMemoryLargeBatchSize(t *testing.T, _, chainID1 ids.ID, sm0, _ Sha
416386
RemoveRequests: byteArr,
417387
}
418388

419-
err = sm0.Apply(
389+
require.NoError(sm0.Apply(
420390
batchChainsAndInputs,
421391
batch,
422-
)
423-
require.NoError(err)
392+
))
424393
}

0 commit comments

Comments
 (0)