chore: use lcommon and pcommon aliases consistently

Signed-off-by: Chris Gianelloni <[email protected]>

Author: wolf31o2

cmd/gouroboros/chainsync.go

@@ -23,9 +23,10 @@ import (
 
 	ouroboros "github.com/blinklabs-io/gouroboros"
 	"github.com/blinklabs-io/gouroboros/ledger"
+	lcommon "github.com/blinklabs-io/gouroboros/ledger/common"
 	"github.com/blinklabs-io/gouroboros/protocol/blockfetch"
 	"github.com/blinklabs-io/gouroboros/protocol/chainsync"
-	"github.com/blinklabs-io/gouroboros/protocol/common"
+	pcommon "github.com/blinklabs-io/gouroboros/protocol/common"
 )
 
 var oConn *ouroboros.Connection
@@ -191,7 +192,7 @@ func testChainSync(f *globalFlags) {
 	}
 	oConn = o
 
-	var point common.Point
+	var point pcommon.Point
 	if chainSyncFlags.tip {
 		tip, err := oConn.ChainSync().Client.GetCurrentTip()
 		if err != nil {
@@ -204,13 +205,13 @@ func testChainSync(f *globalFlags) {
 		slot := uint64(intersectPoint[0].(int)) // #nosec G115
 		// Block hash
 		hash, _ := hex.DecodeString(intersectPoint[1].(string))
-		point = common.NewPoint(slot, hash)
+		point = pcommon.NewPoint(slot, hash)
 	} else {
-		point = common.NewPointOrigin()
+		point = pcommon.NewPointOrigin()
 	}
 	if chainSyncFlags.blockRange {
 		start, end, err := oConn.ChainSync().Client.GetAvailableBlockRange(
-			[]common.Point{point},
+			[]pcommon.Point{point},
 		)
 		if err != nil {
 			fmt.Printf("ERROR: failed to get available block range: %s\n", err)
@@ -220,12 +221,12 @@ func testChainSync(f *globalFlags) {
 		fmt.Printf("End (tip): slot %d, hash %x\n", end.Slot, end.Hash)
 		return
 	} else if !f.ntnProto || !chainSyncFlags.bulk {
-		if err := oConn.ChainSync().Client.Sync([]common.Point{point}); err != nil {
+		if err := oConn.ChainSync().Client.Sync([]pcommon.Point{point}); err != nil {
 			fmt.Printf("ERROR: failed to start chain-sync: %s\n", err)
 			os.Exit(1)
 		}
 	} else {
-		start, end, err := oConn.ChainSync().Client.GetAvailableBlockRange([]common.Point{point})
+		start, end, err := oConn.ChainSync().Client.GetAvailableBlockRange([]pcommon.Point{point})
 		if err != nil {
 			fmt.Printf("ERROR: failed to get available block range: %s\n", err)
 			os.Exit(1)
@@ -246,7 +247,7 @@ func testChainSync(f *globalFlags) {
 
 func chainSyncRollBackwardHandler(
 	ctx chainsync.CallbackContext,
-	point common.Point,
+	point pcommon.Point,
 	tip chainsync.Tip,
 ) error {
 	fmt.Printf("roll backward: point = %#v, tip = %#v\n", point, tip)
@@ -259,18 +260,18 @@ func chainSyncRollForwardHandler(
 	blockData any,
 	tip chainsync.Tip,
 ) error {
-	var block ledger.Block
+	var block lcommon.Block
 	switch v := blockData.(type) {
-	case ledger.Block:
+	case lcommon.Block:
 		block = v
-	case ledger.BlockHeader:
+	case lcommon.BlockHeader:
 		blockSlot := v.SlotNumber()
 		blockHash := v.Hash().Bytes()
 		var err error
 		if oConn == nil {
 			return errors.New("empty ouroboros connection, aborting")
 		}
-		block, err = oConn.BlockFetch().Client.GetBlock(common.NewPoint(blockSlot, blockHash))
+		block, err = oConn.BlockFetch().Client.GetBlock(pcommon.NewPoint(blockSlot, blockHash))
 		if err != nil {
 			return err
 		}
@@ -313,14 +314,14 @@ func chainSyncRollForwardHandler(
 func blockFetchBlockHandler(
 	ctx blockfetch.CallbackContext,
 	blockType uint,
-	blockData ledger.Block,
+	blockData lcommon.Block,
 ) error {
 	switch block := blockData.(type) {
 	case *ledger.ByronEpochBoundaryBlock:
 		fmt.Printf("era = Byron (EBB), epoch = %d, slot = %d, block_no = %d, id = %s\n", block.BlockHeader.ConsensusData.Epoch, block.SlotNumber(), block.BlockNumber(), block.Hash())
 	case *ledger.ByronMainBlock:
 		fmt.Printf("era = Byron, epoch = %d, slot = %d, block_no = %d, id = %s\n", block.BlockHeader.ConsensusData.SlotId.Epoch, block.SlotNumber(), block.BlockNumber(), block.Hash())
-	case ledger.Block:
+	case lcommon.Block:
 		fmt.Printf("era = %s, slot = %d, block_no = %d, id = %s\n", block.Era().Name, block.SlotNumber(), block.BlockNumber(), block.Hash())
 	}
 	return nil

cmd/gouroboros/query.go

@@ -25,6 +25,7 @@ import (
 
 	ouroboros "github.com/blinklabs-io/gouroboros"
 	"github.com/blinklabs-io/gouroboros/ledger"
+	lcommon "github.com/blinklabs-io/gouroboros/ledger/common"
 	"github.com/blinklabs-io/gouroboros/protocol/localstatequery"
 )
 
@@ -180,13 +181,13 @@ func testQuery(f *globalFlags) {
 		}
 		fmt.Printf("genesis-config: %#v\n", *genesisConfig)
 	case "pool-params":
-		var tmpPools []ledger.PoolId
+		var tmpPools []lcommon.PoolId
 		if len(queryFlags.flagset.Args()) <= 1 {
 			fmt.Println("No pools specified")
 			os.Exit(1)
 		}
 		for _, pool := range queryFlags.flagset.Args()[1:] {
-			tmpPoolId, err := ledger.NewPoolIdFromBech32(pool)
+			tmpPoolId, err := lcommon.NewPoolIdFromBech32(pool)
 			if err != nil {
 				fmt.Printf("Invalid bech32 pool ID %q: %s", pool, err)
 				os.Exit(1)
@@ -202,13 +203,13 @@ func testQuery(f *globalFlags) {
 		}
 		fmt.Printf("pool-params: %#v\n", *poolParams)
 	case "utxos-by-address":
-		var tmpAddrs []ledger.Address
+		var tmpAddrs []lcommon.Address
 		if len(queryFlags.flagset.Args()) <= 1 {
 			fmt.Println("No addresses specified")
 			os.Exit(1)
 		}
 		for _, addr := range queryFlags.flagset.Args()[1:] {
-			tmpAddr, err := ledger.NewAddress(addr)
+			tmpAddr, err := lcommon.NewAddress(addr)
 			if err != nil {
 				fmt.Printf("Invalid address %q: %s", addr, err)
 				os.Exit(1)
@@ -234,7 +235,7 @@ func testQuery(f *globalFlags) {
 			}
 		}
 	case "utxos-by-txin":
-		var tmpTxIns []ledger.TransactionInput
+		var tmpTxIns []lcommon.TransactionInput
 		if len(queryFlags.flagset.Args()) <= 1 {
 			fmt.Println("No UTxO IDs specified")
 			os.Exit(1)

ledger/common/gov.go

@@ -55,11 +55,21 @@ func encodeCip129Voter(
 	copy(data[1:], hash)
 	convData, err := bech32.ConvertBits(data, 8, 5, true)
 	if err != nil {
-		panic(fmt.Sprintf("unexpected error converting voter data to base32: %s", err))
+		panic(
+			fmt.Sprintf(
+				"unexpected error converting voter data to base32: %s",
+				err,
+			),
+		)
 	}
 	encoded, err := bech32.Encode(prefix, convData)
 	if err != nil {
-		panic(fmt.Sprintf("unexpected error encoding voter data as bech32: %s", err))
+		panic(
+			fmt.Sprintf(
+				"unexpected error encoding voter data as bech32: %s",
+				err,
+			),
+		)
 	}
 	return encoded
 }

protocol/blockfetch/blockfetch.go

@@ -24,7 +24,7 @@ import (
 	"github.com/blinklabs-io/gouroboros/connection"
 	"github.com/blinklabs-io/gouroboros/ledger"
 	"github.com/blinklabs-io/gouroboros/protocol"
-	"github.com/blinklabs-io/gouroboros/protocol/common"
+	pcommon "github.com/blinklabs-io/gouroboros/protocol/common"
 )
 
 // ProtocolName is the name of the Block Fetch protocol.
@@ -151,7 +151,7 @@ type BlockRawFunc func(CallbackContext, uint, []byte) error
 type BatchDoneFunc func(CallbackContext) error
 
 // RequestRangeFunc is a callback for handling block range requests.
-type RequestRangeFunc func(CallbackContext, common.Point, common.Point) error
+type RequestRangeFunc func(CallbackContext, pcommon.Point, pcommon.Point) error
 
 // New creates a new BlockFetch instance with the given protocol options and configuration.
 func New(protoOptions protocol.ProtocolOptions, cfg *Config) *BlockFetch {

protocol/blockfetch/client.go

@@ -23,7 +23,7 @@ import (
 	"github.com/blinklabs-io/gouroboros/ledger"
 	lcommon "github.com/blinklabs-io/gouroboros/ledger/common"
 	"github.com/blinklabs-io/gouroboros/protocol"
-	"github.com/blinklabs-io/gouroboros/protocol/common"
+	pcommon "github.com/blinklabs-io/gouroboros/protocol/common"
 )
 
 // Client implements the Block Fetch protocol client, which requests blocks from a server.
@@ -122,7 +122,7 @@ func (c *Client) Stop() error {
 
 // GetBlockRange starts an async process to fetch all blocks in the specified range (inclusive).
 // The provided callbacks are used for each block and when the batch is done.
-func (c *Client) GetBlockRange(start common.Point, end common.Point) error {
+func (c *Client) GetBlockRange(start pcommon.Point, end pcommon.Point) error {
 	c.Protocol.Logger().
 		Debug(
 			fmt.Sprintf("calling GetBlockRange(start: {Slot: %d, Hash: %x}, end: {Slot: %d, Hash: %x})",
@@ -158,7 +158,7 @@ func (c *Client) GetBlockRange(start common.Point, end common.Point) error {
 
 // GetBlock requests and returns a single block specified by the provided point.
 // This is a synchronous call that returns the block or an error.
-func (c *Client) GetBlock(point common.Point) (ledger.Block, error) {
+func (c *Client) GetBlock(point pcommon.Point) (ledger.Block, error) {
 	c.Protocol.Logger().
 		Debug(
 			fmt.Sprintf("calling GetBlock(point: {Slot: %d, Hash: %x})", point.Slot, point.Hash),

protocol/blockfetch/client_test.go

@@ -25,7 +25,7 @@ import (
 	"github.com/blinklabs-io/gouroboros/ledger"
 	"github.com/blinklabs-io/gouroboros/protocol"
 	"github.com/blinklabs-io/gouroboros/protocol/blockfetch"
-	ocommon "github.com/blinklabs-io/gouroboros/protocol/common"
+	pcommon "github.com/blinklabs-io/gouroboros/protocol/common"
 	ouroboros_mock "github.com/blinklabs-io/ouroboros-mock"
 	"go.uber.org/goleak"
 )
@@ -151,7 +151,7 @@ func TestGetBlock(t *testing.T) {
 		conversation,
 		func(t *testing.T, oConn *ouroboros.Connection) {
 			blk, err := oConn.BlockFetch().Client.GetBlock(
-				ocommon.NewPoint(
+				pcommon.NewPoint(
 					testBlockSlot,
 					testBlockHash,
 				),
@@ -197,7 +197,7 @@ func TestGetBlockNoBlocks(t *testing.T) {
 		conversation,
 		func(t *testing.T, oConn *ouroboros.Connection) {
 			_, err := oConn.BlockFetch().Client.GetBlock(
-				ocommon.NewPoint(
+				pcommon.NewPoint(
 					12345,
 					test.DecodeHexString("abcdef0123456789"),
 				),

protocol/blockfetch/messages.go

@@ -19,7 +19,7 @@ import (
 
 	"github.com/blinklabs-io/gouroboros/cbor"
 	"github.com/blinklabs-io/gouroboros/protocol"
-	"github.com/blinklabs-io/gouroboros/protocol/common"
+	pcommon "github.com/blinklabs-io/gouroboros/protocol/common"
 )
 
 // MessageTypeRequestRange is the message type for requesting a range of blocks.
@@ -70,12 +70,15 @@ func NewMsgFromCbor(msgType uint, data []byte) (protocol.Message, error) {
 // MsgRequestRange represents a request for a range of blocks.
 type MsgRequestRange struct {
 	protocol.MessageBase
-	Start common.Point // Start point of the range
-	End   common.Point // End point of the range
+	Start pcommon.Point // Start point of the range
+	End   pcommon.Point // End point of the range
 }
 
 // NewMsgRequestRange creates a new MsgRequestRange with the given start and end points.
-func NewMsgRequestRange(start common.Point, end common.Point) *MsgRequestRange {
+func NewMsgRequestRange(
+	start pcommon.Point,
+	end pcommon.Point,
+) *MsgRequestRange {
 	m := &MsgRequestRange{
 		MessageBase: protocol.MessageBase{
 			MessageType: MessageTypeRequestRange,

protocol/chainsync/chainsync.go

@@ -22,7 +22,7 @@ import (
 
 	"github.com/blinklabs-io/gouroboros/connection"
 	"github.com/blinklabs-io/gouroboros/protocol"
-	"github.com/blinklabs-io/gouroboros/protocol/common"
+	pcommon "github.com/blinklabs-io/gouroboros/protocol/common"
 )
 
 // Protocol identifiers
@@ -246,13 +246,13 @@ type CallbackContext struct {
 
 // Callback function types
 type (
-	RollBackwardFunc   func(CallbackContext, common.Point, Tip) error
+	RollBackwardFunc   func(CallbackContext, pcommon.Point, Tip) error
 	RollForwardFunc    func(CallbackContext, uint, any, Tip) error
 	RollForwardRawFunc func(CallbackContext, uint, []byte, Tip) error
 )
 
 type (
-	FindIntersectFunc func(CallbackContext, []common.Point) (common.Point, Tip, error)
+	FindIntersectFunc func(CallbackContext, []pcommon.Point) (pcommon.Point, Tip, error)
 	RequestNextFunc   func(CallbackContext) error
 )