Skip to content

Commit

Permalink
e2e: fix issues detected by staticcheck (#134)
Browse files Browse the repository at this point in the history
  • Loading branch information
@joshuasing
joshuasing authored Jun 4, 2024
1 parent 8015337 commit 12eefff
Showing 1 changed file with 45 additions and 73 deletions.
118 changes: 45 additions & 73 deletions e2e/e2e_ext_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,6 @@ import (
"github.com/hemilabs/heminetwork/hemi/pop"
"github.com/hemilabs/heminetwork/service/bfg"
"github.com/hemilabs/heminetwork/service/bss"
"github.com/hemilabs/heminetwork/service/popm"
)

const (
Expand All @@ -80,13 +79,11 @@ var mockMerkleHashes = []string{

var minerPrivateKeyBytes = []byte{1, 2, 3, 4, 5, 6, 7, 199} // XXX make this a real hardcoded key

type bssWs struct {
wg sync.WaitGroup
addr string
type bssWs struct { // XXX: use protocol.WSConn directly
conn *protocol.WSConn
}

type bfgWs bssWs
type bfgWs bssWs // XXX: use protocol.WSConn directly

// Setup some private keys and authenticators
var (
Expand Down Expand Up @@ -284,19 +281,6 @@ func nextPort(ctx context.Context, t *testing.T) int {
}
}

func createPopm(ctx context.Context, t *testing.T, bfgUrl string, bfgPrivateWsUrl string) (*popm.Miner, error) {
m, err := popm.NewMiner(&popm.Config{
BFGWSURL: bfgPrivateWsUrl,
BTCChainName: "testnet3",
BTCPrivateKey: "FC4B44FDC798E5D11229B84EC6B21B98EF40B0E4E1D12C6488CB5967F8CE94C6",
})
if err != nil {
return nil, err
}

return m, nil
}

func createBfgServerWithAuth(ctx context.Context, t *testing.T, pgUri string, electrumxAddr string, btcStartHeight uint64, auth bool) (*bfg.Server, string, string, string) {
bfgPrivateListenAddress := fmt.Sprintf(":%d", nextPort(ctx, t))
bfgPublicListenAddress := fmt.Sprintf(":%d", nextPort(ctx, t))
Expand Down Expand Up @@ -567,7 +551,7 @@ func handleMockElectrumxConnection(ctx context.Context, t *testing.T, conn net.C
1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 1, 2, 3, 4, 5, 6,
7, 8, 9, 10, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 1, 2,
}
_j := []struct {
j := []struct {
Hash string `json:"tx_hash"`
Height uint64 `json:"height"`
Index uint64 `json:"tx_pos"`
Expand All @@ -578,12 +562,12 @@ func handleMockElectrumxConnection(ctx context.Context, t *testing.T, conn net.C
Index: 9999,
Value: 999999,
}}
j, err := json.Marshal(_j)
b, err := json.Marshal(j)
if err != nil {
panic(err)
}

res.Result = j
res.Result = b
}

b, err := json.Marshal(res)
Expand Down Expand Up @@ -1764,31 +1748,27 @@ func TestProcessBitcoinBlockNewBtcBlock(t *testing.T) {
// wait a max of 10 seconds (with a resolution of 1 second) for the
// btc_block to be inserted into the db. this happens on a timer
// when checking electrumx
_ctx, _cancel := context.WithTimeout(context.Background(), 10*time.Second)
defer _cancel()
var _err error
var _btcBlockHeader *bfgd.BtcBlock
lctx, lcancel := context.WithTimeout(ctx, 10*time.Second)
defer lcancel()
var btcBlockHeader *bfgd.BtcBlock
loop:
for {
select {
case <-_ctx.Done():
break
case <-lctx.Done():
t.Fatal(lctx.Err())
case <-time.After(1 * time.Second):
_btcBlockHeader, _err = db.BtcBlockByHash(ctx, [32]byte(btcHeaderHash))
if _err == nil {
break
btcBlockHeader, err = db.BtcBlockByHash(ctx, [32]byte(btcHeaderHash))
if err == nil {
break loop
}
}

if _btcBlockHeader != nil {
break
}
}

if _err != nil {
t.Fatal(_err)
if err != nil {
t.Fatal(err)
}

diff := deep.Equal(_btcBlockHeader, &bfgd.BtcBlock{
diff := deep.Equal(btcBlockHeader, &bfgd.BtcBlock{
Hash: btcHeaderHash,
Header: btcHeader,
Height: uint64(btcHeight),
Expand Down Expand Up @@ -1844,28 +1824,24 @@ func TestProcessBitcoinBlockNewFullPopBasis(t *testing.T) {
// wait a max of 10 seconds (with a resolution of 1 second) for the
// btc_block to be inserted into the db. this happens on a timer
// when checking electrumx
_ctx, _cancel := context.WithTimeout(context.Background(), 10*time.Second)
defer _cancel()
var _err error
lctx, lcancel := context.WithTimeout(ctx, 10*time.Second)
defer lcancel()
var popBases []bfgd.PopBasis
loop:
for {
select {
case <-_ctx.Done():
break
case <-lctx.Done():
break loop
case <-time.After(1 * time.Second):
popBases, _err = db.PopBasisByL2KeystoneAbrevHash(ctx, [32]byte(hemi.L2KeystoneAbbreviate(l2Keystone).Hash()), false)
if _err == nil && len(popBases) > 0 {
break
popBases, err = db.PopBasisByL2KeystoneAbrevHash(ctx, [32]byte(hemi.L2KeystoneAbbreviate(l2Keystone).Hash()), false)
if len(popBases) > 0 {
break loop
}
}

if len(popBases) > 0 {
break
}
}

if _err != nil {
t.Fatal(_err)
if err != nil {
t.Fatal(err)
}

btcTxId, err := btcchainhash.NewHashFromStr(mockTxHash)
Expand Down Expand Up @@ -2013,28 +1989,24 @@ func TestBitcoinBroadcastThenUpdate(t *testing.T) {
// wait a max of 10 seconds (with a resolution of 1 second) for the
// btc_block to be inserted into the db. this happens on a timer
// when checking electrumx
_ctx, _cancel := context.WithTimeout(context.Background(), 10*time.Second)
defer _cancel()
var _err error
lctx, lcancel := context.WithTimeout(ctx, 10*time.Second)
defer lcancel()
var popBases []bfgd.PopBasis
loop:
for {
select {
case <-_ctx.Done():
break
case <-lctx.Done():
break loop
case <-time.After(1 * time.Second):
popBases, _err = db.PopBasisByL2KeystoneAbrevHash(ctx, [32]byte(hemi.L2KeystoneAbbreviate(l2Keystone).Hash()), true)
if _err == nil && len(popBases) > 0 {
break
popBases, err = db.PopBasisByL2KeystoneAbrevHash(ctx, [32]byte(hemi.L2KeystoneAbbreviate(l2Keystone).Hash()), true)
if len(popBases) > 0 {
break loop
}
}

if len(popBases) > 0 {
break
}
}

if _err != nil {
t.Fatal(_err)
if err != nil {
t.Fatal(err)
}

btcHeader, err := hex.DecodeString(strings.Replace(mockEncodedBlockHeader, "\"", "", 2))
Expand Down Expand Up @@ -3121,15 +3093,15 @@ func TestNotifyMultipleBFGClients(t *testing.T) {

for i := range 10 {
wg.Add(1)
go func(_i int) {
go func() {
defer wg.Done()
c, _, err := websocket.Dial(ctx, bfgWsurl, nil)
if err != nil {
panic(err)
}

// ensure we can safely close 1 and handle the rest
if _i == 5 {
if i == 5 {
c.CloseNow()
return
} else {
Expand All @@ -3147,7 +3119,7 @@ func TestNotifyMultipleBFGClients(t *testing.T) {
v.Header.Command != bfgapi.CmdBTCFinalityNotification {
panic(fmt.Sprintf("wrong command: %s", v.Header.Command))
}
}(i)
}()
}

wg.Wait()
Expand Down Expand Up @@ -3193,15 +3165,15 @@ func TestNotifyMultipleBSSClients(t *testing.T) {

for i := range 10 {
wg.Add(1)
go func(_i int) {
go func() {
defer wg.Done()
c, _, err := websocket.Dial(ctx, bssWsurl, nil)
if err != nil {
panic(err)
}

// ensure we can safely close 1 and handle the rest
if _i == 5 {
if i == 5 {
c.CloseNow()
return
} else {
Expand All @@ -3219,7 +3191,7 @@ func TestNotifyMultipleBSSClients(t *testing.T) {
v.Header.Command != bssapi.CmdBTCFinalityNotification {
panic(fmt.Sprintf("wrong command: %s", v.Header.Command))
}
}(i)
}()
}

wg.Wait()
Expand Down Expand Up @@ -3741,15 +3713,15 @@ func createBtcBlock(ctx context.Context, t *testing.T, db bfgd.Database, count i
Height: uint64(height),
}

_l2Keystone := hemi.L2Keystone{
hemiL2Keystone := hemi.L2Keystone{
ParentEPHash: parentEpHash,
PrevKeystoneEPHash: prevKeystoneEpHash,
StateRoot: stateRoot,
EPHash: epHash,
L2BlockNumber: l2BlockNumber,
}

l2KeystoneAbrevHash := hemi.L2KeystoneAbbreviate(_l2Keystone).Hash()
l2KeystoneAbrevHash := hemi.L2KeystoneAbbreviate(hemiL2Keystone).Hash()
l2Keystone := bfgd.L2Keystone{
Hash: l2KeystoneAbrevHash,
ParentEPHash: parentEpHash,
Expand Down

0 comments on commit 12eefff

Please sign in to comment.