Skip to content

Commit 587ff14

Browse files
committed
fix: linter issues
1 parent 5c8b8ef commit 587ff14

File tree

5 files changed

+23
-28
lines changed

5 files changed

+23
-28
lines changed

genesis.go

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,8 @@ import (
1111
"github.com/bsv-blockchain/go-wire"
1212
)
1313

14-
var (
15-
// GenesisActivationHeight is the block height at which the genesis block
16-
GenesisActivationHeight = uint32(620538)
17-
)
14+
// GenesisActivationHeight is the block height at which the genesis block
15+
var GenesisActivationHeight = uint32(620538)
1816

1917
// genesisCoinbaseTx is the coinbase transaction for the genesis blocks for
2018
// the main network, regression test network, and test network (version 3).

genesis_test.go

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ import (
1717
// TestGenesisBlock tests the genesis block of the main network for validity by
1818
// checking the encoded bytes and hashes.
1919
func TestGenesisBlock(t *testing.T) {
20-
2120
// Encode the genesis block to raw bytes.
2221
var buf bytes.Buffer
2322

@@ -73,7 +72,6 @@ func TestRegTestGenesisBlock(t *testing.T) {
7372
// TestTestNetGenesisBlock tests the genesis block of the test network (version
7473
// 3) for validity by checking the encoded bytes and hashes.
7574
func TestTestNetGenesisBlock(t *testing.T) {
76-
7775
// Encode the genesis block to raw bytes.
7876
var buf bytes.Buffer
7977

@@ -101,7 +99,6 @@ func TestTestNetGenesisBlock(t *testing.T) {
10199

102100
// TestGenesisCoinbase tests the genesis coinbase transaction of the main
103101
func TestGenesisCoinbase(t *testing.T) {
104-
105102
expectedCoinbaseHex := "01000000010000000000000000000000000000000000000000000000000000000000000000ffffffff4d04ffff001d0104455468652054696d65732030332f4a616e2f32303039204368616e63656c6c6f72206f6e206272696e6b206f66207365636f6e64206261696c6f757420666f722062616e6b73ffffffff0100f2052a01000000434104678afdb0fe5548271967f1a67130b7105cd6a828e03909a67962e0ea1f61deb649f6bc3f4cef38c4f35504e51ec112de5c384df7ba0b8d578a4c702b6bf11d5fac00000000"
106103
gcb := MainNetParams.GenesisBlock.Transactions[0]
107104

@@ -119,7 +116,6 @@ func TestGenesisCoinbase(t *testing.T) {
119116

120117
// TestGenesisCoinbaseBytes tests the genesis coinbase transaction
121118
func TestGenesisCoinbaseBytes(t *testing.T) {
122-
123119
expected := MainNetParams.GenesisBlock.Transactions[0].TxHash().String()
124120
expectedCoinbaseHash := "4a5e1e4baab89f3a32518a88c31bc87f618f76673e2cc77ab2127b7afdeda33b"
125121

@@ -146,7 +142,6 @@ func TestGenesisCoinbaseBytes(t *testing.T) {
146142

147143
// TestGenesisActivationHeight checks the default and updated value of GenesisActivationHeight.
148144
func TestGenesisActivationHeight(t *testing.T) {
149-
150145
defaultHeight := uint32(620538)
151146
assert.Equal(t, defaultHeight, GenesisActivationHeight, "Expected default GenesisActivationHeight")
152147

params.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -895,6 +895,7 @@ func IsPubKeyHashAddrID(network wire.BitcoinNet, id byte) bool {
895895
if mapID := legacyPubKeyHashAddrIDByNetwork[network]; mapID != nil {
896896
return *mapID == id
897897
}
898+
898899
return false
899900
}
900901

@@ -916,6 +917,7 @@ func IsScriptHashAddrID(network wire.BitcoinNet, id byte) bool {
916917
if mapID := legacyScriptHashAddrIDByNetwork[network]; mapID != nil {
917918
return *mapID == id
918919
}
920+
919921
return false
920922
}
921923

@@ -937,6 +939,7 @@ func IsCashAddressPrefix(network wire.BitcoinNet, prefix string) bool {
937939
if want := cashAddressPrefixesMap[network]; want != "" {
938940
return strings.EqualFold(want, prefix)
939941
}
942+
940943
return false
941944
}
942945

params_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@ func TestInvalidHashStr(t *testing.T) {
2121
t.Errorf("Expected panic for invalid hash, got nil")
2222
}
2323
}()
24+
2425
newHashFromStr("banana")
2526
}
2627

2728
// TestSeeds ensures the right seeds are defined.
2829
func TestSeeds(t *testing.T) {
29-
3030
expectedSeeds := []DNSSeed{
3131
{"seed.bitcoinsv.io", true},
3232
}

register_test.go

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import (
44
"strings"
55
"testing"
66

7-
"github.com/stretchr/testify/require"
87
"github.com/stretchr/testify/suite"
98
)
109

@@ -53,53 +52,53 @@ func (ts *TestSuite) TestRegisterFlow() {
5352
builtins := []*Params{&MainNetParams, &RegressionNetParams, &TestNetParams}
5453

5554
// 1. Built-in nets should already resolve magics/HD before explicit Register().
56-
ts.T().Run("baseline-builtins", func(_ *testing.T) {
55+
ts.Run("baseline-builtins", func() {
5756
for _, p := range builtins {
5857
ts.assertAddrMagics(p, true)
5958
ts.assertHD(p, false)
6059
}
6160
})
6261

6362
// 2. Register built-ins (should succeed) and then ensure duplicates fail.
64-
ts.T().Run("register-builtins", func(t *testing.T) {
63+
ts.Run("register-builtins", func() {
6564
for _, p := range builtins {
66-
require.NoError(t, Register(p), "first register %s", p.Name)
67-
require.ErrorIs(t, Register(p), ErrDuplicateNet, "duplicate register %s", p.Name)
65+
ts.Require().NoError(Register(p), "first register %s", p.Name)
66+
ts.Require().ErrorIs(Register(p), ErrDuplicateNet, "duplicate register %s", p.Name)
6867
}
6968
})
7069

7170
// 3. mocknet flow: invalid → register → valid.
72-
ts.T().Run("mocknet-flow", func(t *testing.T) {
71+
ts.Run("mocknet-flow", func() {
7372
ts.assertAddrMagics(&mockNetParams, false)
7473
ts.assertHD(&mockNetParams, true)
7574

76-
require.NoError(t, Register(&mockNetParams))
77-
require.ErrorIs(t, Register(&mockNetParams), ErrDuplicateNet)
75+
ts.Require().NoError(Register(&mockNetParams))
76+
ts.Require().ErrorIs(Register(&mockNetParams), ErrDuplicateNet)
7877

7978
ts.assertAddrMagics(&mockNetParams, true)
8079
ts.assertHD(&mockNetParams, false)
8180
})
8281

8382
// 4. Edge-case invalid inputs preserved from original tests.
84-
ts.T().Run("invalid-edge-cases", func(t *testing.T) {
85-
require.False(t, IsPubKeyHashAddrID(MainNetParams.Net, 0xff))
86-
require.False(t, IsScriptHashAddrID(MainNetParams.Net, 0xff))
87-
require.False(t, IsCashAddressPrefix(MainNetParams.Net, "abc1"))
88-
require.False(t, IsCashAddressPrefix(MainNetParams.Net, "1"))
89-
require.False(t, IsCashAddressPrefix(MainNetParams.Net, MainNetParams.CashAddressPrefix))
83+
ts.Run("invalid-edge-cases", func() {
84+
ts.Require().False(IsPubKeyHashAddrID(MainNetParams.Net, 0xff))
85+
ts.Require().False(IsScriptHashAddrID(MainNetParams.Net, 0xff))
86+
ts.Require().False(IsCashAddressPrefix(MainNetParams.Net, "abc1"))
87+
ts.Require().False(IsCashAddressPrefix(MainNetParams.Net, "1"))
88+
ts.Require().False(IsCashAddressPrefix(MainNetParams.Net, MainNetParams.CashAddressPrefix))
9089

9190
_, err := HDPrivateKeyToPublicKeyID([]byte{0xff, 0xff, 0xff, 0xff})
92-
require.ErrorIs(t, err, ErrUnknownHDKeyID)
91+
ts.Require().ErrorIs(err, ErrUnknownHDKeyID)
9392

9493
_, err = HDPrivateKeyToPublicKeyID([]byte{0xff})
95-
require.ErrorIs(t, err, ErrUnknownHDKeyID)
94+
ts.Require().ErrorIs(err, ErrUnknownHDKeyID)
9695
})
9796

9897
// 5. Final duplicate sweep for *all* registered nets.
99-
ts.T().Run("duplicate-all-nets", func(t *testing.T) {
98+
ts.Run("duplicate-all-nets", func() {
10099
all := append(builtins, &mockNetParams)
101100
for _, p := range all {
102-
require.ErrorIs(t, Register(p), ErrDuplicateNet, "duplicate final %s", p.Name)
101+
ts.Require().ErrorIs(Register(p), ErrDuplicateNet, "duplicate final %s", p.Name)
103102
}
104103
})
105104
}

0 commit comments

Comments
 (0)