Skip to content

Commit 6ef9ce5

Browse files
adecaroadecaro
authored
todo cleanup (LFDT-Panurus#1910)
Signed-off-by: Angelo De Caro <adc@zurich.ibm.com>
1 parent b7a8546 commit 6ef9ce5

7 files changed

Lines changed: 20 additions & 31 deletions

File tree

‎token/services/identity/interop/htlc/deserializer_test.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ SPDX-License-Identifier: Apache-2.0
77
package htlc_test
88

99
import (
10-
"context"
1110
"encoding/json"
1211
"errors"
1312
"testing"
@@ -105,7 +104,7 @@ func TestTypedIdentityDeserializer_GetAuditInfo(t *testing.T) {
105104
ctx := t.Context()
106105

107106
// wrong type
108-
_, err := d.GetAuditInfo(context.TODO(), []byte("id"), identity.Type(99), []byte{}, &mockDriver.AuditInfoProvider{})
107+
_, err := d.GetAuditInfo(t.Context(), []byte("id"), identity.Type(99), []byte{}, &mockDriver.AuditInfoProvider{})
109108
require.Error(t, err)
110109

111110
// invalid script

‎token/services/identity/x509/crypto/mocks/bccsp.go‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,42 +18,34 @@ type BCCSP struct {
1818
}
1919

2020
func (m *BCCSP) KeyGen(opts bccsp.KeyGenOpts) (k bccsp.Key, err error) {
21-
// TODO implement me
2221
panic("implement me")
2322
}
2423

2524
func (m *BCCSP) KeyDeriv(k bccsp.Key, opts bccsp.KeyDerivOpts) (dk bccsp.Key, err error) {
26-
// TODO implement me
2725
panic("implement me")
2826
}
2927

3028
func (m *BCCSP) KeyImport(raw any, opts bccsp.KeyImportOpts) (k bccsp.Key, err error) {
31-
// TODO implement me
3229
panic("implement me")
3330
}
3431

3532
func (m *BCCSP) Hash(msg []byte, opts bccsp.HashOpts) (hash []byte, err error) {
36-
// TODO implement me
3733
panic("implement me")
3834
}
3935

4036
func (m *BCCSP) GetHash(opts bccsp.HashOpts) (h hash.Hash, err error) {
41-
// TODO implement me
4237
panic("implement me")
4338
}
4439

4540
func (m *BCCSP) Verify(k bccsp.Key, signature, digest []byte, opts bccsp.SignerOpts) (valid bool, err error) {
46-
// TODO implement me
4741
panic("implement me")
4842
}
4943

5044
func (m *BCCSP) Encrypt(k bccsp.Key, plaintext []byte, opts bccsp.EncrypterOpts) (ciphertext []byte, err error) {
51-
// TODO implement me
5245
panic("implement me")
5346
}
5447

5548
func (m *BCCSP) Decrypt(k bccsp.Key, ciphertext []byte, opts bccsp.DecrypterOpts) (plaintext []byte, err error) {
56-
// TODO implement me
5749
panic("implement me")
5850
}
5951

‎token/services/identity/x509/crypto/mocks/key.go‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,26 +11,21 @@ import "github.com/hyperledger/fabric-lib-go/bccsp"
1111
type Key struct{}
1212

1313
func (t *Key) Bytes() ([]byte, error) {
14-
// TODO implement me
1514
panic("implement me")
1615
}
1716

1817
func (t *Key) SKI() []byte {
19-
// TODO implement me
2018
panic("implement me")
2119
}
2220

2321
func (t *Key) Symmetric() bool {
24-
// TODO implement me
2522
panic("implement me")
2623
}
2724

2825
func (t *Key) Private() bool {
29-
// TODO implement me
3026
panic("implement me")
3127
}
3228

3329
func (t *Key) PublicKey() (bccsp.Key, error) {
34-
// TODO implement me
3530
panic("implement me")
3631
}

‎token/services/nfttx/qe_unit_test.go‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ SPDX-License-Identifier: Apache-2.0
77
package nfttx_test
88

99
import (
10-
"context"
1110
"encoding/base64"
1211
"encoding/json"
1312
"errors"
@@ -42,11 +41,11 @@ func TestQueryExecutor_QueryByKey_FilterErrors(t *testing.T) {
4241
qe := nfttx.NewTestQueryExecutor(fakeSelector, fakeVault, 64)
4342

4443
fakeSelector.FilterReturns(nil, nfttx.ErrNoResults)
45-
err := qe.QueryByKey(context.TODO(), &House{}, "LinearID", "123")
44+
err := qe.QueryByKey(t.Context(), &House{}, "LinearID", "123")
4645
require.ErrorIs(t, err, nfttx.ErrNoResults)
4746

4847
fakeSelector.FilterReturns(nil, errors.New("some filter error"))
49-
err = qe.QueryByKey(context.TODO(), &House{}, "LinearID", "123")
48+
err = qe.QueryByKey(t.Context(), &House{}, "LinearID", "123")
5049
require.Error(t, err)
5150
assert.Contains(t, err.Error(), "some filter error")
5251
}
@@ -59,7 +58,7 @@ func TestQueryExecutor_QueryByKey_VaultErrors(t *testing.T) {
5958

6059
fakeSelector.FilterReturns([]*token2.ID{{TxId: "tx1", Index: 0}}, nil)
6160
fakeVault.GetTokensReturns(nil, errors.New("vault error"))
62-
err := qe.QueryByKey(context.TODO(), &House{}, "LinearID", "123")
61+
err := qe.QueryByKey(t.Context(), &House{}, "LinearID", "123")
6362
require.Error(t, err)
6463
assert.Contains(t, err.Error(), "vault error")
6564
}
@@ -88,19 +87,19 @@ func TestQueryExecutor_QueryByKey_Success(t *testing.T) {
8887
fakeVault.GetTokensReturns(tokens, nil)
8988

9089
var house House
91-
err = qe.QueryByKey(context.TODO(), &house, "LinearID", "123")
90+
err = qe.QueryByKey(t.Context(), &house, "LinearID", "123")
9291
require.NoError(t, err)
9392
assert.Equal(t, "123", house.LinearID)
9493

9594
// fail decoding type
9695
tokens[0].Type = "not-base64"
97-
err = qe.QueryByKey(context.TODO(), &house, "LinearID", "123")
96+
err = qe.QueryByKey(t.Context(), &house, "LinearID", "123")
9897
require.Error(t, err)
9998
assert.Contains(t, err.Error(), "failed to decode type")
10099

101100
// test no matching token, empty tokens list
102101
fakeVault.GetTokensReturns([]*token2.Token{}, nil)
103-
err = qe.QueryByKey(context.TODO(), &house, "LinearID", "123")
102+
err = qe.QueryByKey(t.Context(), &house, "LinearID", "123")
104103
require.ErrorIs(t, err, nfttx.ErrNoResults)
105104
}
106105

@@ -116,7 +115,7 @@ func TestQueryExecutor_QueryByKey_BadQuantity(t *testing.T) {
116115
fakeSelector.FilterReturns([]*token2.ID{{TxId: "tx1", Index: 0}}, nil)
117116
fakeVault.GetTokensReturns(tokens, nil)
118117

119-
err := qe.QueryByKey(context.TODO(), &House{}, "LinearID", "123")
118+
err := qe.QueryByKey(t.Context(), &House{}, "LinearID", "123")
120119
require.Error(t, err)
121120
assert.Contains(t, err.Error(), "failed to convert quantity")
122121
}

‎token/services/nfttx/wallet_unit_test.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ SPDX-License-Identifier: Apache-2.0
77
package nfttx_test
88

99
import (
10-
"context"
1110
"errors"
1211
"testing"
1312

@@ -206,6 +205,6 @@ func TestOwnerWallet_QueryByKey(t *testing.T) {
206205
Precision: 64,
207206
}
208207
assert.Panics(t, func() {
209-
_ = ow.QueryByKey(context.TODO(), &House{}, "LinearID", "123")
208+
_ = ow.QueryByKey(t.Context(), &House{}, "LinearID", "123")
210209
})
211210
}

‎token/services/selector/sherdlock/manager_test.go‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -82,15 +82,16 @@ func startManagers(t *testing.T, number int, backoff time.Duration, maxRetries i
8282
replicas := make([]testutils.EnhancedManager, number)
8383

8484
for i := range number {
85-
replica, err := createManager(pgConnStr, backoff, maxRetries)
85+
replica, err := createManager(t, pgConnStr, backoff, maxRetries)
8686
require.NoError(t, err)
8787
replicas[i] = replica
8888
}
8989

9090
return replicas, terminate
9191
}
9292

93-
func createManager(pgConnStr string, backoff time.Duration, maxRetries int) (testutils.EnhancedManager, error) {
93+
func createManager(t *testing.T, pgConnStr string, backoff time.Duration, maxRetries int) (testutils.EnhancedManager, error) {
94+
t.Helper()
9495
d := postgres.NewDriverWithDbProvider(multiplexed.MockTypeConfig(postgres2.Persistence, postgres2.Config{
9596
TablePrefix: "test",
9697
DataSource: pgConnStr,
@@ -113,7 +114,7 @@ func createManager(pgConnStr string, backoff time.Duration, maxRetries int) (tes
113114
fetcher := newMixedFetcher(tokenDB.(dbtest.TestTokenDB), m, 0, 0, 0)
114115
manager := NewManager(fetcher, lockDB, testutils.TokenQuantityPrecision, backoff, maxRetries, 0, 0, m)
115116

116-
return testutils.NewEnhancedManager(manager, tokenDB.(dbtest.TestTokenDB)), nil
117+
return testutils.NewEnhancedManager(t, manager, tokenDB.(dbtest.TestTokenDB)), nil
117118
}
118119

119120
func startContainer(t *testing.T) (func(), string) {

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

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -123,12 +123,16 @@ func TestInsufficientTokensManyReplicas(t *testing.T, replicas []EnhancedManager
123123
type enhancedManager struct {
124124
token2.SelectorManager
125125
tokenDB driver.TokenStore
126+
t *testing.T
126127
}
127128

128-
func NewEnhancedManager(manager token2.SelectorManager, tokenDB driver.TokenStore) *enhancedManager {
129+
func NewEnhancedManager(t *testing.T, manager token2.SelectorManager, tokenDB driver.TokenStore) *enhancedManager {
130+
t.Helper()
131+
129132
return &enhancedManager{
130133
SelectorManager: manager,
131134
tokenDB: tokenDB,
135+
t: t,
132136
}
133137
}
134138

@@ -149,7 +153,7 @@ func (m *enhancedManager) UpdateTokens(deleted []*token.ID, added []token.Unspen
149153
}
150154
if len(deleted) > 0 {
151155
for _, t := range deleted {
152-
if err := tx.Delete(context.TODO(), *t, "me"); err != nil {
156+
if err := tx.Delete(m.t.Context(), *t, "me"); err != nil {
153157
err2 := tx.Rollback()
154158

155159
return errors.Wrapf(err, "failed to delete - while rolling back: %v", err2)
@@ -158,7 +162,7 @@ func (m *enhancedManager) UpdateTokens(deleted []*token.ID, added []token.Unspen
158162
}
159163
if len(added) > 0 {
160164
for _, t := range added {
161-
if err := tx.StoreToken(context.TODO(), driver.TokenRecord{
165+
if err := tx.StoreToken(m.t.Context(), driver.TokenRecord{
162166
TxID: t.Id.TxId,
163167
Index: t.Id.Index,
164168
IssuerRaw: []byte{},

0 commit comments

Comments
 (0)