Add encode/decode keystone test

database/tbcd/level/encodedecode_test.go

@@ -0,0 +1,41 @@
+package level
+
+import (
+	"reflect"
+	"testing"
+
+	btcchainhash "github.com/btcsuite/btcd/chaincfg/chainhash"
+
+	"github.com/hemilabs/heminetwork/database/tbcd"
+	"github.com/hemilabs/heminetwork/hemi"
+)
+
+func fillOutBytes(prefix string, size int) []byte {
+	result := []byte(prefix)
+	for len(result) < size {
+		result = append(result, '_')
+	}
+	return result
+}
+
+func TestKeystoneEncodeDecode(t *testing.T) {
+	hks := hemi.L2Keystone{
+		Version:            1,
+		L1BlockNumber:      5,
+		L2BlockNumber:      44,
+		ParentEPHash:       fillOutBytes("v1parentephash", 32),
+		PrevKeystoneEPHash: fillOutBytes("v1prevkeystoneephash", 32),
+		StateRoot:          fillOutBytes("v1stateroot", 32),
+		EPHash:             fillOutBytes("v1ephash", 32),
+	}
+	abrvKs := hemi.L2KeystoneAbbreviate(hks).Serialize()
+	ks := tbcd.Keystone{
+		BlockHash:           btcchainhash.Hash(fillOutBytes("blockhash", 32)),
+		AbbreviatedKeystone: abrvKs,
+	}
+	eks := encodeKeystone(ks)
+	nks := decodeKeystone(eks[:])
+	if !reflect.DeepEqual(nks, ks) {
+		t.Fatal("decoded keystone not equal")
+	}
+}

database/tbcd/level/level.go

@@ -1778,7 +1778,6 @@ func (l *ldb) BlockKeystoneUpdate(ctx context.Context, direction int, keystones
 			// Only delete keystone if it is in the previously found block.
 			if ks.BlockHash.IsEqual(&v.BlockHash) {
 				kssBatch.Delete(k[:])
-			} else {
 			}
 		case 1:
 			has, err := kssTx.Has(k[:], nil)

database/tbcd/level/level_test.go

@@ -13,6 +13,7 @@ import (
 	"github.com/go-test/deep"
 
 	btcchainhash "github.com/btcsuite/btcd/chaincfg/chainhash"
+
 	"github.com/hemilabs/heminetwork/database"
 	"github.com/hemilabs/heminetwork/database/tbcd"
 	"github.com/hemilabs/heminetwork/database/tbcd/level"
@@ -132,7 +133,7 @@ func makeKssMap(kssList []hemi.L2Keystone) map[chainhash.Hash]tbcd.Keystone {
 		abrvKs := hemi.L2KeystoneAbbreviate(l2Keystone).Serialize()
 		kssMap[*hemi.L2KeystoneAbbreviate(l2Keystone).Hash()] = tbcd.Keystone{
 			BlockHash:           btcchainhash.Hash(fillOutBytes("blockhash", 32)),
-			AbbreviatedKeystone: abrvKs[:],
+			AbbreviatedKeystone: abrvKs,
 		}
 	}
 	return kssMap
@@ -151,7 +152,8 @@ func TestKeystoneUpdate(t *testing.T) {
 			PrevKeystoneEPHash: fillOutBytes("v1prevkeystoneephash", 32),
 			StateRoot:          fillOutBytes("v1stateroot", 32),
 			EPHash:             fillOutBytes("v1ephash", 32),
-		}, {
+		},
+		{
 			Version:            1,
 			L1BlockNumber:      6,
 			L2BlockNumber:      44,
@@ -168,15 +170,17 @@ func TestKeystoneUpdate(t *testing.T) {
 			PrevKeystoneEPHash: fillOutBytes("i1prevkeystoneephash", 32),
 			StateRoot:          fillOutBytes("i1stateroot", 32),
 			EPHash:             fillOutBytes("i1ephash", 32),
-		}, {
+		},
+		{
 			Version:            1,
 			L1BlockNumber:      6,
 			L2BlockNumber:      44,
 			ParentEPHash:       fillOutBytes("i2parentephash", 32),
 			PrevKeystoneEPHash: fillOutBytes("i2prevkeystoneephash", 32),
 			StateRoot:          fillOutBytes("i2stateroot", 32),
 			EPHash:             fillOutBytes("i2ephash", 32),
-		}}
+		},
+	}
 
 	type testTableItem struct {
 		name           string
@@ -254,7 +258,6 @@ func TestKeystoneUpdate(t *testing.T) {
 
 	for _, tti := range testTable {
 		t.Run(tti.name, func(t *testing.T) {
-
 			home := t.TempDir()
 			t.Logf("temp: %v", home)