Skip to content

Commit 7aedb5a

Browse files
committed
linting fixes
1 parent 6270545 commit 7aedb5a

File tree

3 files changed

+15
-7
lines changed

3 files changed

+15
-7
lines changed

errors.go

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,4 +65,13 @@ var (
6565

6666
// ErrReadError is a generic read error for testing
6767
ErrReadError = errors.New("read error")
68+
69+
// ErrTransactionNil is returned when a transaction is nil during serialization
70+
ErrTransactionNil = errors.New("transaction is nil, cannot serialize")
71+
72+
// ErrTransactionWrite is returned when writing a transaction fails
73+
ErrTransactionWrite = errors.New("error writing transaction")
74+
75+
// ErrTransactionRead is returned when reading a transaction fails
76+
ErrTransactionRead = errors.New("error reading transaction")
6877
)

subtree_data.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -135,13 +135,13 @@ func (s *Data) WriteTransactionsToWriter(w io.Writer, startIdx, endIdx int) erro
135135
}
136136

137137
if s.Txs[i] == nil {
138-
return fmt.Errorf("transaction at index %d is nil, cannot serialize", i)
138+
return ErrTransactionNil
139139
}
140140

141141
// Serialize and stream transaction bytes to writer
142142
txBytes := s.Txs[i].SerializeBytes()
143143
if _, err := w.Write(txBytes); err != nil {
144-
return fmt.Errorf("error writing transaction at index %d: %w", i, err)
144+
return fmt.Errorf("%w at index %d: %w", ErrTransactionWrite, i, err)
145145
}
146146
}
147147

@@ -176,7 +176,7 @@ func (s *Data) ReadTransactionsFromReader(r io.Reader, startIdx, endIdx int) (in
176176
if errors.Is(err, io.EOF) {
177177
break
178178
}
179-
return txsRead, fmt.Errorf("error reading transaction at index %d: %w", i, err)
179+
return txsRead, fmt.Errorf("%w at index %d: %w", ErrTransactionRead, i, err)
180180
}
181181

182182
// Validate tx hash matches expected

subtree_data_test.go

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -397,7 +397,7 @@ func setupTestSubtreeData(t *testing.T) (*Subtree, *Data, []*bt.Tx) {
397397
txs := make([]*bt.Tx, 4)
398398
for i := range txs {
399399
txs[i] = tx.Clone()
400-
txs[i].Version = uint32(i + 1)
400+
txs[i].Version = uint32(i + 1) //nolint:gosec // G115: test data, safe conversion
401401
}
402402

403403
subtree, err := NewTree(2)
@@ -447,8 +447,7 @@ func TestWriteTransactionsToWriter(t *testing.T) {
447447

448448
buf := &bytes.Buffer{}
449449
err := subtreeData.WriteTransactionsToWriter(buf, 0, 2)
450-
require.Error(t, err)
451-
assert.Contains(t, err.Error(), "transaction at index 1 is nil")
450+
require.ErrorIs(t, err, ErrTransactionNil)
452451
})
453452
}
454453

@@ -495,7 +494,7 @@ func TestReadTransactionsFromReader(t *testing.T) {
495494
// Try to read more transactions than available
496495
targetData := NewSubtreeData(subtree)
497496
numRead, err := targetData.ReadTransactionsFromReader(bytes.NewReader(serialized), 0, 10)
498-
require.NoError(t, err) // EOF not an error
497+
require.NoError(t, err) // EOF not an error
499498
assert.Equal(t, 4, numRead) // Only 4 available
500499
})
501500
}

0 commit comments

Comments
 (0)