move ordering info interface to types

common/types/types.go

@@ -7,6 +7,7 @@ SPDX-License-Identifier: Apache-2.0
 package types
 
 import (
+	"fmt"
 	"math"
 )
 
@@ -66,3 +67,9 @@ type Batch interface {
 	BatchID
 	Requests() BatchedRequests
 }
+
+// OrderingInfo is an opaque object that provides extra information on the order of the batch attestation and
+// metadata to be used in the construction of the block.
+type OrderingInfo interface {
+	fmt.Stringer
+}

core/abc_test.go

@@ -51,14 +51,14 @@ func (s *bafSender) SendBAF(baf arma_types.BatchAttestationFragment) {
 }
 
 type naiveblock struct {
-	order       core.OrderingInfo
+	order       arma_types.OrderingInfo
 	batch       arma_types.Batch
 	attestation arma_types.BatchAttestation
 }
 
 type naiveBlockLedger chan naiveblock
 
-func (n naiveBlockLedger) Append(batch arma_types.Batch, orderingInfo core.OrderingInfo) {
+func (n naiveBlockLedger) Append(batch arma_types.Batch, orderingInfo arma_types.OrderingInfo) {
 	n <- naiveblock{
 		order: orderingInfo,
 		batch: batch,

core/assembler.go

@@ -9,7 +9,6 @@ package core
 import (
 	"encoding/hex"
 	"errors"
-	"fmt"
 	"sync"
 	"time"
 
@@ -24,7 +23,7 @@ type OrderedBatchAttestation interface {
 	BatchAttestation() types.BatchAttestation
 	// OrderingInfo is an opaque object that provides extra information on the order of the batch attestation and
 	// metadata to be used in the construction of the block.
-	OrderingInfo() OrderingInfo
+	OrderingInfo() types.OrderingInfo
 }
 
 type BatchReplicator interface {
@@ -37,12 +36,8 @@ type AssemblerIndex interface {
 	Stop()
 }
 
-type OrderingInfo interface {
-	fmt.Stringer
-}
-
 type AssemblerLedgerWriter interface {
-	Append(batch types.Batch, orderingInfo OrderingInfo)
+	Append(batch types.Batch, orderingInfo types.OrderingInfo)
 	Close()
 }
 

core/assembler_test.go

@@ -138,20 +138,20 @@ func (noi *naiveOrderingInfo) String() string {
 
 type naiveOrderedBatchAttestation struct {
 	ba           types.BatchAttestation
-	orderingInfo core.OrderingInfo
+	orderingInfo types.OrderingInfo
 }
 
 func (noba *naiveOrderedBatchAttestation) BatchAttestation() types.BatchAttestation {
 	return noba.ba
 }
 
-func (noba *naiveOrderedBatchAttestation) OrderingInfo() core.OrderingInfo {
+func (noba *naiveOrderedBatchAttestation) OrderingInfo() types.OrderingInfo {
 	return noba.orderingInfo
 }
 
 type naiveAssemblerLedger chan core.OrderedBatchAttestation
 
-func (n naiveAssemblerLedger) Append(batch types.Batch, orderingInfo core.OrderingInfo) {
+func (n naiveAssemblerLedger) Append(batch types.Batch, orderingInfo types.OrderingInfo) {
 	noba := &naiveOrderedBatchAttestation{
 		ba: &naiveBatchAttestation{
 			primary: batch.Primary(),

node/assembler/assembler_test.go

@@ -64,7 +64,7 @@ func createLedgerMockWrappingRealLedger(logger types.Logger, ledgerPath string)
 	mock := &ledger_mocks.FakeAssemblerLedgerReaderWriter{}
 	ledger, err := node_ledger.NewAssemblerLedger(logger, ledgerPath)
 
-	mock.AppendCalls(func(b types.Batch, i core.OrderingInfo) {
+	mock.AppendCalls(func(b types.Batch, i types.OrderingInfo) {
 		ledger.Append(b, i)
 	})
 	mock.AppendConfigCalls(func(b *common.Block, dn types.DecisionNum) {

node/consensus/state/available_batch_ordered.go

@@ -9,10 +9,8 @@ package state
 import (
 	"fmt"
 
-	"github.com/hyperledger/fabric-x-orderer/common/types"
-	"github.com/hyperledger/fabric-x-orderer/core"
-
 	smartbft_types "github.com/hyperledger-labs/SmartBFT/pkg/types"
+	"github.com/hyperledger/fabric-x-orderer/common/types"
 )
 
 type OrderingInformation struct {
@@ -42,6 +40,6 @@ func (abo *AvailableBatchOrdered) BatchAttestation() types.BatchAttestation {
 
 // OrderingInfo returns an opaque object that provides extra information on the order of the batch attestation and
 // metadata to be used in the construction of the block.
-func (abo *AvailableBatchOrdered) OrderingInfo() core.OrderingInfo {
+func (abo *AvailableBatchOrdered) OrderingInfo() types.OrderingInfo {
 	return abo.OrderingInformation
 }

node/ledger/assembler_ledger.go

@@ -13,15 +13,13 @@ import (
 	"sync/atomic"
 	"time"
 
+	"github.com/hyperledger/fabric-lib-go/common/metrics/disabled"
+	"github.com/hyperledger/fabric-protos-go-apiv2/common"
 	"github.com/hyperledger/fabric-x-orderer/common/ledger/blkstorage"
 	"github.com/hyperledger/fabric-x-orderer/common/ledger/blockledger"
 	"github.com/hyperledger/fabric-x-orderer/common/ledger/blockledger/fileledger"
 	"github.com/hyperledger/fabric-x-orderer/common/types"
-	"github.com/hyperledger/fabric-x-orderer/core"
 	"github.com/hyperledger/fabric-x-orderer/node/consensus/state"
-
-	"github.com/hyperledger/fabric-lib-go/common/metrics/disabled"
-	"github.com/hyperledger/fabric-protos-go-apiv2/common"
 	"github.com/hyperledger/fabric/protoutil"
 )
 
@@ -33,7 +31,7 @@ type (
 //go:generate counterfeiter -o ./mocks/assembler_ledger.go . AssemblerLedgerReaderWriter
 type AssemblerLedgerReaderWriter interface {
 	GetTxCount() uint64
-	Append(batch types.Batch, orderingInfo core.OrderingInfo)
+	Append(batch types.Batch, orderingInfo types.OrderingInfo)
 	AppendConfig(configBlock *common.Block, decisionNum types.DecisionNum)
 	LastOrderingInfo() (*state.OrderingInformation, error)
 	LedgerReader() blockledger.Reader
@@ -134,7 +132,7 @@ func (l *AssemblerLedger) GetTxCount() uint64 {
 	return c
 }
 
-func (l *AssemblerLedger) Append(batch types.Batch, orderingInfo core.OrderingInfo) {
+func (l *AssemblerLedger) Append(batch types.Batch, orderingInfo types.OrderingInfo) {
 	ordInfo := orderingInfo.(*state.OrderingInformation)
 	t1 := time.Now()
 	defer func() {