Skip to content

Commit 4ac04ae

Browse files
Shitaibinfjl
Shitaibin
authored and
fjl
committed
all: replace fmt.Print* calls with t.Log* in tests (#19670)
1 parent 8f80caf commit 4ac04ae

File tree

10 files changed

+85
-87
lines changed

10 files changed

+85
-87
lines changed

‎cmd/puppeth/genesis_test.go‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ package main
1818

1919
import (
2020
"encoding/json"
21-
"fmt"
2221
"io/ioutil"
2322
"reflect"
2423
"strings"
@@ -61,7 +60,7 @@ func TestAlethSturebyConverter(t *testing.T) {
6160
got := strings.Split(c.Sdump(spec), "\n")
6261
for i := 0; i < len(exp) && i < len(got); i++ {
6362
if exp[i] != got[i] {
64-
fmt.Printf("got: %v\nexp: %v\n", exp[i], got[i])
63+
t.Logf("got: %v\nexp: %v\n", exp[i], got[i])
6564
}
6665
}
6766
}
@@ -102,7 +101,7 @@ func TestParitySturebyConverter(t *testing.T) {
102101
got := strings.Split(c.Sdump(spec), "\n")
103102
for i := 0; i < len(exp) && i < len(got); i++ {
104103
if exp[i] != got[i] {
105-
fmt.Printf("got: %v\nexp: %v\n", exp[i], got[i])
104+
t.Logf("got: %v\nexp: %v\n", exp[i], got[i])
106105
}
107106
}
108107
}

‎core/rawdb/freezer_table_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ func print(t *testing.T, f *freezerTable, item uint64) {
4646
if err != nil {
4747
t.Fatal(err)
4848
}
49-
fmt.Printf("db[%d] = %x\n", item, a)
49+
t.Logf("db[%d] = %x\n", item, a)
5050
}
5151

5252
// TestFreezerBasics test initializing a freezertable from scratch, writing to the table,

‎crypto/ecies/ecies_test.go‎

Lines changed: 37 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -58,11 +58,11 @@ func TestKDF(t *testing.T) {
5858

5959
k, err := concatKDF(h, msg, nil, 64)
6060
if err != nil {
61-
fmt.Println(err.Error())
61+
t.Log(err.Error())
6262
t.FailNow()
6363
}
6464
if len(k) != 64 {
65-
fmt.Printf("KDF: generated key is the wrong size (%d instead of 64\n", len(k))
65+
t.Logf("KDF: generated key is the wrong size (%d instead of 64\n", len(k))
6666
t.FailNow()
6767
}
6868
}
@@ -97,31 +97,31 @@ func cmpPublic(pub1, pub2 PublicKey) bool {
9797
func TestSharedKey(t *testing.T) {
9898
prv1, err := GenerateKey(rand.Reader, DefaultCurve, nil)
9999
if err != nil {
100-
fmt.Println(err.Error())
100+
t.Log(err.Error())
101101
t.FailNow()
102102
}
103103
skLen := MaxSharedKeyLength(&prv1.PublicKey) / 2
104104

105105
prv2, err := GenerateKey(rand.Reader, DefaultCurve, nil)
106106
if err != nil {
107-
fmt.Println(err.Error())
107+
t.Log(err.Error())
108108
t.FailNow()
109109
}
110110

111111
sk1, err := prv1.GenerateShared(&prv2.PublicKey, skLen, skLen)
112112
if err != nil {
113-
fmt.Println(err.Error())
113+
t.Log(err.Error())
114114
t.FailNow()
115115
}
116116

117117
sk2, err := prv2.GenerateShared(&prv1.PublicKey, skLen, skLen)
118118
if err != nil {
119-
fmt.Println(err.Error())
119+
t.Log(err.Error())
120120
t.FailNow()
121121
}
122122

123123
if !bytes.Equal(sk1, sk2) {
124-
fmt.Println(ErrBadSharedKeys.Error())
124+
t.Log(ErrBadSharedKeys.Error())
125125
t.FailNow()
126126
}
127127
}
@@ -151,7 +151,7 @@ func TestSharedKeyPadding(t *testing.T) {
151151
// test shared secret generation
152152
sk1, err := prv0.GenerateShared(&prv1.PublicKey, 16, 16)
153153
if err != nil {
154-
fmt.Println(err.Error())
154+
t.Log(err.Error())
155155
}
156156

157157
sk2, err := prv1.GenerateShared(&prv0.PublicKey, 16, 16)
@@ -169,25 +169,25 @@ func TestSharedKeyPadding(t *testing.T) {
169169
func TestTooBigSharedKey(t *testing.T) {
170170
prv1, err := GenerateKey(rand.Reader, DefaultCurve, nil)
171171
if err != nil {
172-
fmt.Println(err.Error())
172+
t.Log(err.Error())
173173
t.FailNow()
174174
}
175175

176176
prv2, err := GenerateKey(rand.Reader, DefaultCurve, nil)
177177
if err != nil {
178-
fmt.Println(err.Error())
178+
t.Log(err.Error())
179179
t.FailNow()
180180
}
181181

182182
_, err = prv1.GenerateShared(&prv2.PublicKey, 32, 32)
183183
if err != ErrSharedKeyTooBig {
184-
fmt.Println("ecdh: shared key should be too large for curve")
184+
t.Log("ecdh: shared key should be too large for curve")
185185
t.FailNow()
186186
}
187187

188188
_, err = prv2.GenerateShared(&prv1.PublicKey, 32, 32)
189189
if err != ErrSharedKeyTooBig {
190-
fmt.Println("ecdh: shared key should be too large for curve")
190+
t.Log("ecdh: shared key should be too large for curve")
191191
t.FailNow()
192192
}
193193
}
@@ -196,7 +196,7 @@ func TestTooBigSharedKey(t *testing.T) {
196196
func BenchmarkGenerateKeyP256(b *testing.B) {
197197
for i := 0; i < b.N; i++ {
198198
if _, err := GenerateKey(rand.Reader, elliptic.P256(), nil); err != nil {
199-
fmt.Println(err.Error())
199+
b.Log(err.Error())
200200
b.FailNow()
201201
}
202202
}
@@ -206,14 +206,14 @@ func BenchmarkGenerateKeyP256(b *testing.B) {
206206
func BenchmarkGenSharedKeyP256(b *testing.B) {
207207
prv, err := GenerateKey(rand.Reader, elliptic.P256(), nil)
208208
if err != nil {
209-
fmt.Println(err.Error())
209+
b.Log(err.Error())
210210
b.FailNow()
211211
}
212212
b.ResetTimer()
213213
for i := 0; i < b.N; i++ {
214214
_, err := prv.GenerateShared(&prv.PublicKey, 16, 16)
215215
if err != nil {
216-
fmt.Println(err.Error())
216+
b.Log(err.Error())
217217
b.FailNow()
218218
}
219219
}
@@ -223,14 +223,14 @@ func BenchmarkGenSharedKeyP256(b *testing.B) {
223223
func BenchmarkGenSharedKeyS256(b *testing.B) {
224224
prv, err := GenerateKey(rand.Reader, crypto.S256(), nil)
225225
if err != nil {
226-
fmt.Println(err.Error())
226+
b.Log(err.Error())
227227
b.FailNow()
228228
}
229229
b.ResetTimer()
230230
for i := 0; i < b.N; i++ {
231231
_, err := prv.GenerateShared(&prv.PublicKey, 16, 16)
232232
if err != nil {
233-
fmt.Println(err.Error())
233+
b.Log(err.Error())
234234
b.FailNow()
235235
}
236236
}
@@ -240,37 +240,37 @@ func BenchmarkGenSharedKeyS256(b *testing.B) {
240240
func TestEncryptDecrypt(t *testing.T) {
241241
prv1, err := GenerateKey(rand.Reader, DefaultCurve, nil)
242242
if err != nil {
243-
fmt.Println(err.Error())
243+
t.Log(err.Error())
244244
t.FailNow()
245245
}
246246

247247
prv2, err := GenerateKey(rand.Reader, DefaultCurve, nil)
248248
if err != nil {
249-
fmt.Println(err.Error())
249+
t.Log(err.Error())
250250
t.FailNow()
251251
}
252252

253253
message := []byte("Hello, world.")
254254
ct, err := Encrypt(rand.Reader, &prv2.PublicKey, message, nil, nil)
255255
if err != nil {
256-
fmt.Println(err.Error())
256+
t.Log(err.Error())
257257
t.FailNow()
258258
}
259259

260260
pt, err := prv2.Decrypt(ct, nil, nil)
261261
if err != nil {
262-
fmt.Println(err.Error())
262+
t.Log(err.Error())
263263
t.FailNow()
264264
}
265265

266266
if !bytes.Equal(pt, message) {
267-
fmt.Println("ecies: plaintext doesn't match message")
267+
t.Log("ecies: plaintext doesn't match message")
268268
t.FailNow()
269269
}
270270

271271
_, err = prv1.Decrypt(ct, nil, nil)
272272
if err == nil {
273-
fmt.Println("ecies: encryption should not have succeeded")
273+
t.Log("ecies: encryption should not have succeeded")
274274
t.FailNow()
275275
}
276276
}
@@ -341,48 +341,48 @@ func TestParamSelection(t *testing.T) {
341341
func testParamSelection(t *testing.T, c testCase) {
342342
params := ParamsFromCurve(c.Curve)
343343
if params == nil && c.Expected != nil {
344-
fmt.Printf("%s (%s)\n", ErrInvalidParams.Error(), c.Name)
344+
t.Logf("%s (%s)\n", ErrInvalidParams.Error(), c.Name)
345345
t.FailNow()
346346
} else if params != nil && !cmpParams(params, c.Expected) {
347-
fmt.Printf("ecies: parameters should be invalid (%s)\n",
347+
t.Logf("ecies: parameters should be invalid (%s)\n",
348348
c.Name)
349349
t.FailNow()
350350
}
351351

352352
prv1, err := GenerateKey(rand.Reader, DefaultCurve, nil)
353353
if err != nil {
354-
fmt.Printf("%s (%s)\n", err.Error(), c.Name)
354+
t.Logf("%s (%s)\n", err.Error(), c.Name)
355355
t.FailNow()
356356
}
357357

358358
prv2, err := GenerateKey(rand.Reader, DefaultCurve, nil)
359359
if err != nil {
360-
fmt.Printf("%s (%s)\n", err.Error(), c.Name)
360+
t.Logf("%s (%s)\n", err.Error(), c.Name)
361361
t.FailNow()
362362
}
363363

364364
message := []byte("Hello, world.")
365365
ct, err := Encrypt(rand.Reader, &prv2.PublicKey, message, nil, nil)
366366
if err != nil {
367-
fmt.Printf("%s (%s)\n", err.Error(), c.Name)
367+
t.Logf("%s (%s)\n", err.Error(), c.Name)
368368
t.FailNow()
369369
}
370370

371371
pt, err := prv2.Decrypt(ct, nil, nil)
372372
if err != nil {
373-
fmt.Printf("%s (%s)\n", err.Error(), c.Name)
373+
t.Logf("%s (%s)\n", err.Error(), c.Name)
374374
t.FailNow()
375375
}
376376

377377
if !bytes.Equal(pt, message) {
378-
fmt.Printf("ecies: plaintext doesn't match message (%s)\n",
378+
t.Logf("ecies: plaintext doesn't match message (%s)\n",
379379
c.Name)
380380
t.FailNow()
381381
}
382382

383383
_, err = prv1.Decrypt(ct, nil, nil)
384384
if err == nil {
385-
fmt.Printf("ecies: encryption should not have succeeded (%s)\n",
385+
t.Logf("ecies: encryption should not have succeeded (%s)\n",
386386
c.Name)
387387
t.FailNow()
388388
}
@@ -396,22 +396,22 @@ func TestBasicKeyValidation(t *testing.T) {
396396

397397
prv, err := GenerateKey(rand.Reader, DefaultCurve, nil)
398398
if err != nil {
399-
fmt.Println(err.Error())
399+
t.Log(err.Error())
400400
t.FailNow()
401401
}
402402

403403
message := []byte("Hello, world.")
404404
ct, err := Encrypt(rand.Reader, &prv.PublicKey, message, nil, nil)
405405
if err != nil {
406-
fmt.Println(err.Error())
406+
t.Log(err.Error())
407407
t.FailNow()
408408
}
409409

410410
for _, b := range badBytes {
411411
ct[0] = b
412412
_, err := prv.Decrypt(ct, nil, nil)
413413
if err != ErrInvalidPublicKey {
414-
fmt.Println("ecies: validated an invalid key")
414+
t.Log("ecies: validated an invalid key")
415415
t.FailNow()
416416
}
417417
}
@@ -450,18 +450,18 @@ func TestSharedKeyStatic(t *testing.T) {
450450

451451
sk1, err := prv1.GenerateShared(&prv2.PublicKey, skLen, skLen)
452452
if err != nil {
453-
fmt.Println(err.Error())
453+
t.Log(err.Error())
454454
t.FailNow()
455455
}
456456

457457
sk2, err := prv2.GenerateShared(&prv1.PublicKey, skLen, skLen)
458458
if err != nil {
459-
fmt.Println(err.Error())
459+
t.Log(err.Error())
460460
t.FailNow()
461461
}
462462

463463
if !bytes.Equal(sk1, sk2) {
464-
fmt.Println(ErrBadSharedKeys.Error())
464+
t.Log(ErrBadSharedKeys.Error())
465465
t.FailNow()
466466
}
467467

‎eth/downloader/downloader_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1614,8 +1614,8 @@ func TestRemoteHeaderRequestSpan(t *testing.T) {
16141614
if failed {
16151615
res := strings.Replace(fmt.Sprint(data), " ", ",", -1)
16161616
exp := strings.Replace(fmt.Sprint(tt.expected), " ", ",", -1)
1617-
fmt.Printf("got: %v\n", res)
1618-
fmt.Printf("exp: %v\n", exp)
1617+
t.Logf("got: %v\n", res)
1618+
t.Logf("exp: %v\n", exp)
16191619
t.Errorf("test %d: wrong values", i)
16201620
}
16211621
}

0 commit comments

Comments
 (0)