Skip to content

Commit cbf9225

Browse files
mrz1836mrz1836
authored
[Tests] Normalize subtree test names and reuse message constant (#35)
* test(subtree): dedupe size error message * fix: test issue * fix: error message * fix: error message
1 parent 0b5e160 commit cbf9225

File tree

2 files changed

+29
-24
lines changed

2 files changed

+29
-24
lines changed

‎merkle_tree_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ func TestGetMerkleProofForCoinbase(t *testing.T) {
6767
})
6868
}
6969

70-
func TestBuildMerkleTreeStoreFromBytes(t *testing.T) {
70+
func TestBuildMerkleTreeStoreFromBytesExtended(t *testing.T) {
7171
t.Run("empty nodes", func(t *testing.T) {
7272
merkles, err := BuildMerkleTreeStoreFromBytes([]Node{})
7373
require.NoError(t, err)

‎subtree_test.go‎

Lines changed: 28 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,11 @@ import (
1111
"github.com/stretchr/testify/require"
1212
)
1313

14+
const (
15+
expectedSizeFourMessage = "expected size to be 4, got %d"
16+
expectedSizeEightMessage = "expected size to be 8, got %d"
17+
)
18+
1419
func TestNewTree(t *testing.T) {
1520
t.Run("invalid size", func(t *testing.T) {
1621
_, err := NewTreeByLeafCount(123)
@@ -48,7 +53,7 @@ func TestRootHash(t *testing.T) {
4853
require.NoError(t, err)
4954

5055
if st.Size() != 4 {
51-
t.Errorf("expected size to be 4, got %d", st.Size())
56+
t.Errorf(expectedSizeFourMessage, st.Size())
5257
}
5358

5459
hash1, _ := chainhash.NewHashFromStr("97af9ad3583e2f83fc1e44e475e3a3ee31ec032449cc88b491479ef7d187c115")
@@ -65,7 +70,7 @@ func TestRootHash(t *testing.T) {
6570
})
6671
}
6772

68-
func Test_RootHashWithReplaceRootNode(t *testing.T) {
73+
func TestRootHashWithReplaceRootNode(t *testing.T) {
6974
t.Run("empty tree", func(t *testing.T) {
7075
st, err := NewTree(2)
7176
require.NoError(t, err)
@@ -94,7 +99,7 @@ func Test_RootHashWithReplaceRootNode(t *testing.T) {
9499
require.NoError(t, err)
95100

96101
if st.Size() != 4 {
97-
t.Errorf("expected size to be 4, got %d", st.Size())
102+
t.Errorf(expectedSizeFourMessage, st.Size())
98103
}
99104

100105
_ = st.AddCoinbaseNode()
@@ -115,7 +120,7 @@ func Test_RootHashWithReplaceRootNode(t *testing.T) {
115120
require.NoError(t, err)
116121

117122
if st.Size() != 4 {
118-
t.Errorf("expected size to be 4, got %d", st.Size())
123+
t.Errorf(expectedSizeFourMessage, st.Size())
119124
}
120125

121126
hash1, _ := chainhash.NewHashFromStr("97af9ad3583e2f83fc1e44e475e3a3ee31ec032449cc88b491479ef7d187c115")
@@ -142,7 +147,7 @@ func TestGetMap(t *testing.T) {
142147
require.NoError(t, err)
143148

144149
if st.Size() != 4 {
145-
t.Errorf("expected size to be 4, got %d", st.Size())
150+
t.Errorf(expectedSizeFourMessage, st.Size())
146151
}
147152

148153
hash1, _ := chainhash.NewHashFromStr("8c14f0db3df150123e6f3dbbf30f8b955a8249b62ac1d1ff16284aefa3d06d87")
@@ -175,7 +180,7 @@ func TestHasNode(t *testing.T) {
175180
require.NoError(t, err)
176181

177182
if st.Size() != 4 {
178-
t.Errorf("expected size to be 4, got %d", st.Size())
183+
t.Errorf(expectedSizeFourMessage, st.Size())
179184
}
180185

181186
hash1, _ := chainhash.NewHashFromStr("8c14f0db3df150123e6f3dbbf30f8b955a8249b62ac1d1ff16284aefa3d06d87")
@@ -190,7 +195,7 @@ func TestHasNode(t *testing.T) {
190195
require.NoError(t, err)
191196

192197
if st.Size() != 4 {
193-
t.Errorf("expected size to be 4, got %d", st.Size())
198+
t.Errorf(expectedSizeFourMessage, st.Size())
194199
}
195200

196201
hash1, _ := chainhash.NewHashFromStr("8c14f0db3df150123e6f3dbbf30f8b955a8249b62ac1d1ff16284aefa3d06d87")
@@ -205,7 +210,7 @@ func TestGetNode(t *testing.T) {
205210
require.NoError(t, err)
206211

207212
if st.Size() != 4 {
208-
t.Errorf("expected size to be 4, got %d", st.Size())
213+
t.Errorf(expectedSizeFourMessage, st.Size())
209214
}
210215

211216
hash1, _ := chainhash.NewHashFromStr("8c14f0db3df150123e6f3dbbf30f8b955a8249b62ac1d1ff16284aefa3d06d87")
@@ -222,7 +227,7 @@ func TestGetNode(t *testing.T) {
222227
require.NoError(t, err)
223228

224229
if st.Size() != 4 {
225-
t.Errorf("expected size to be 4, got %d", st.Size())
230+
t.Errorf(expectedSizeFourMessage, st.Size())
226231
}
227232

228233
hash1, _ := chainhash.NewHashFromStr("8c14f0db3df150123e6f3dbbf30f8b955a8249b62ac1d1ff16284aefa3d06d87")
@@ -267,7 +272,7 @@ func TestRootHashSimon(t *testing.T) {
267272
require.NoError(t, err)
268273

269274
if st.Size() != 4 {
270-
t.Errorf("expected size to be 4, got %d", st.Size())
275+
t.Errorf(expectedSizeFourMessage, st.Size())
271276
}
272277

273278
hash1, _ := chainhash.NewHashFromStr("8c14f0db3df150123e6f3dbbf30f8b955a8249b62ac1d1ff16284aefa3d06d87")
@@ -288,7 +293,7 @@ func TestTwoTransactions(t *testing.T) {
288293
require.NoError(t, err)
289294

290295
if st.Size() != 2 {
291-
t.Errorf("expected size to be 4, got %d", st.Size())
296+
t.Errorf(expectedSizeFourMessage, st.Size())
292297
}
293298

294299
hash1, _ := chainhash.NewHashFromStr("de2c2e8628ab837ceff3de0217083d9d5feb71f758a5d083ada0b33a36e1b30e")
@@ -300,12 +305,12 @@ func TestTwoTransactions(t *testing.T) {
300305
assert.Equal(t, "7a059188283323a2ef0e02dd9f8ba1ac550f94646290d0a52a586e5426c956c5", rootHash.String())
301306
}
302307

303-
func TestSubtree_GetMerkleProof(t *testing.T) {
308+
func TestSubtreeGetMerkleProof(t *testing.T) {
304309
st, err := NewTree(3)
305310
require.NoError(t, err)
306311

307312
if st.Size() != 8 {
308-
t.Errorf("expected size to be 4, got %d", st.Size())
313+
t.Errorf(expectedSizeEightMessage, st.Size())
309314
}
310315

311316
txIDs := []string{
@@ -344,13 +349,13 @@ func TestSubtree_GetMerkleProof(t *testing.T) {
344349
assert.Empty(t, proof)
345350
}
346351

347-
func Test_Serialize(t *testing.T) {
352+
func TestSubtreeSerialize(t *testing.T) {
348353
t.Run("Serialize", func(t *testing.T) {
349354
st, err := NewTree(2)
350355
require.NoError(t, err)
351356

352357
if st.Size() != 4 {
353-
t.Errorf("expected size to be 4, got %d", st.Size())
358+
t.Errorf(expectedSizeFourMessage, st.Size())
354359
}
355360

356361
hash1, _ := chainhash.NewHashFromStr("8c14f0db3df150123e6f3dbbf30f8b955a8249b62ac1d1ff16284aefa3d06d87")
@@ -387,7 +392,7 @@ func Test_Serialize(t *testing.T) {
387392
require.NoError(t, err)
388393

389394
if st.Size() != 4 {
390-
t.Errorf("expected size to be 4, got %d", st.Size())
395+
t.Errorf(expectedSizeFourMessage, st.Size())
391396
}
392397

393398
hash1, _ := chainhash.NewHashFromStr("8c14f0db3df150123e6f3dbbf30f8b955a8249b62ac1d1ff16284aefa3d06d87")
@@ -478,7 +483,7 @@ func Test_Serialize(t *testing.T) {
478483
require.NoError(t, err)
479484

480485
if st.Size() != 4 {
481-
t.Errorf("expected size to be 4, got %d", st.Size())
486+
t.Errorf(expectedSizeFourMessage, st.Size())
482487
}
483488

484489
hash1, _ := chainhash.NewHashFromStr("8c14f0db3df150123e6f3dbbf30f8b955a8249b62ac1d1ff16284aefa3d06d87")
@@ -532,13 +537,13 @@ func Test_Serialize(t *testing.T) {
532537
})
533538
}
534539

535-
func Test_Duplicate(t *testing.T) {
540+
func TestDuplicate(t *testing.T) {
536541
t.Run("Duplicate", func(t *testing.T) {
537542
st, err := NewTree(2)
538543
require.NoError(t, err)
539544

540545
if st.Size() != 4 {
541-
t.Errorf("expected size to be 4, got %d", st.Size())
546+
t.Errorf(expectedSizeFourMessage, st.Size())
542547
}
543548

544549
hash1, _ := chainhash.NewHashFromStr("8c14f0db3df150123e6f3dbbf30f8b955a8249b62ac1d1ff16284aefa3d06d87")
@@ -570,7 +575,7 @@ func Test_Duplicate(t *testing.T) {
570575
require.NoError(t, err)
571576

572577
if st.Size() != 4 {
573-
t.Errorf("expected size to be 4, got %d", st.Size())
578+
t.Errorf(expectedSizeFourMessage, st.Size())
574579
}
575580

576581
hash1, _ := chainhash.NewHashFromStr("8c14f0db3df150123e6f3dbbf30f8b955a8249b62ac1d1ff16284aefa3d06d87")
@@ -588,7 +593,7 @@ func Test_Duplicate(t *testing.T) {
588593
})
589594
}
590595

591-
func TestSubtree_NodeIndex(t *testing.T) {
596+
func TestSubtreeNodeIndex(t *testing.T) {
592597
tx1 := tx.Clone()
593598
tx1.Version = 1
594599
hash1 := *tx1.TxIDChainHash()
@@ -657,7 +662,7 @@ func getSubtreeBytes(t *testing.T) (*Subtree, []byte) {
657662
require.NoError(t, err)
658663

659664
if st.Size() != 4 {
660-
t.Errorf("expected size to be 4, got %d", st.Size())
665+
t.Errorf(expectedSizeFourMessage, st.Size())
661666
}
662667

663668
hash1, _ := chainhash.NewHashFromStr("8c14f0db3df150123e6f3dbbf30f8b955a8249b62ac1d1ff16284aefa3d06d87")
@@ -675,7 +680,7 @@ func getSubtreeBytes(t *testing.T) (*Subtree, []byte) {
675680
return st, serializedBytes
676681
}
677682

678-
func Test_BuildMerkleTreeStoreFromBytes(t *testing.T) {
683+
func TestBuildMerkleTreeStoreFromBytes(t *testing.T) {
679684
t.Run("complete tree", func(t *testing.T) {
680685
hashes := make([]*chainhash.Hash, 8)
681686
hashes[0], _ = chainhash.NewHashFromStr("97af9ad3583e2f83fc1e44e475e3a3ee31ec032449cc88b491479ef7d187c115")

0 commit comments

Comments
 (0)