Merge pull request #915 from bjartek/main

send in own logger and expose function

Author: m-Peter

bootstrap/bootstrap.go

@@ -81,9 +81,15 @@ type Bootstrap struct {
 }
 
 func New(config config.Config) (*Bootstrap, error) {
-	logger := zerolog.New(config.LogWriter).
-		With().Timestamp().Str("version", api.Version).
-		Logger().Level(config.LogLevel)
+	var logger zerolog.Logger
+
+	if config.Logger != nil {
+		logger = *config.Logger
+	} else {
+		logger = zerolog.New(config.LogWriter).
+			With().Timestamp().Str("version", api.Version).
+			Logger().Level(config.LogLevel)
+	}
 
 	client, err := setupCrossSporkClient(config, logger)
 	if err != nil {

config/config.go

@@ -80,6 +80,8 @@ type Config struct {
 	LogLevel zerolog.Level
 	// LogWriter defines the writer used for logging
 	LogWriter io.Writer
+	// Logger if you bring your own
+	Logger *zerolog.Logger
 	// RateLimit requests made by the client identified by IP over any protocol (ws/http).
 	RateLimit uint64
 	// Address header used to identified clients, usually set by the proxy

models/block.go

@@ -65,9 +65,9 @@ func (b *Block) Hash() (gethCommon.Hash, error) {
 	return b.Block.Hash()
 }
 
-// decodeBlockEvent takes a cadence event that contains executed block payload and
+// DecodeBlockEvent takes a cadence event that contains executed block payload and
 // decodes it into the Block type.
-func decodeBlockEvent(event cadence.Event) (*Block, *events.BlockEventPayload, error) {
+func DecodeBlockEvent(event cadence.Event) (*Block, *events.BlockEventPayload, error) {
 	payload, err := events.DecodeBlockEventPayload(event)
 	if err != nil {
 		return nil, nil, fmt.Errorf(

models/block_test.go

@@ -120,7 +120,7 @@ func Test_DecodeBlockExecutedEvent(t *testing.T) {
 	encEv, err := ev.Payload.ToCadence(flowGo.Previewnet)
 	require.NoError(t, err)
 
-	decBlock, _, err := decodeBlockEvent(encEv)
+	decBlock, _, err := DecodeBlockEvent(encEv)
 	require.NoError(t, err)
 
 	assert.Equal(t, decBlock, block)
@@ -158,7 +158,7 @@ func Test_DecodingLegacyBlockExecutedEvent(t *testing.T) {
 		hashToCadenceArrayValue(block.TransactionHashRoot),
 	}).WithType(eventType)
 
-	b, _, err := decodeBlockEvent(legacyEvent)
+	b, _, err := DecodeBlockEvent(legacyEvent)
 	require.NoError(t, err)
 
 	require.Equal(t, block.ParentBlockHash, b.ParentBlockHash)

models/events.go

@@ -104,7 +104,7 @@ func decodeCadenceEvents(events flow.BlockEvents) (*CadenceEvents, error) {
 				return nil, fmt.Errorf("EVM block was already set for Flow block: %d", events.Height)
 			}
 
-			block, blockEventPayload, err := decodeBlockEvent(val)
+			block, blockEventPayload, err := DecodeBlockEvent(val)
 			if err != nil {
 				return nil, err
 			}
@@ -115,7 +115,7 @@ func decodeCadenceEvents(events flow.BlockEvents) (*CadenceEvents, error) {
 		}
 
 		if isTransactionExecutedEvent(val) {
-			tx, receipt, txEventPayload, err := decodeTransactionEvent(val)
+			tx, receipt, txEventPayload, err := DecodeTransactionEvent(val)
 			if err != nil {
 				return nil, err
 			}

models/receipt_test.go

@@ -10,7 +10,7 @@ import (
 func Test_DecodeReceipts(t *testing.T) {
 	cdcEv, rec := createTestEvent(t, evmTxBinary)
 
-	_, receipt, _, err := decodeTransactionEvent(cdcEv)
+	_, receipt, _, err := DecodeTransactionEvent(cdcEv)
 	require.NoError(t, err)
 
 	assert.Equal(t, BaseFeePerGas, receipt.EffectiveGasPrice)

models/transaction.go

@@ -225,10 +225,10 @@ func (tc TransactionCall) MarshalBinary() ([]byte, error) {
 	return append([]byte{tc.Type()}, encoded...), err
 }
 
-// decodeTransactionEvent takes a cadence event for transaction executed
+// DecodeTransactionEvent takes a cadence event for transaction executed
 // and decodes its payload into a Transaction interface and a Receipt.
 // The concrete type will be either a TransactionCall or a DirectCall.
-func decodeTransactionEvent(event cadence.Event) (
+func DecodeTransactionEvent(event cadence.Event) (
 	Transaction,
 	*Receipt,
 	*events.TransactionEventPayload,

models/transaction_test.go

@@ -85,7 +85,7 @@ func createTestEvent(t *testing.T, txBinary string) (cadence.Event, *types.Resul
 func Test_DecodeEVMTransaction(t *testing.T) {
 	cdcEv, _ := createTestEvent(t, evmTxBinary)
 
-	decTx, _, _, err := decodeTransactionEvent(cdcEv)
+	decTx, _, _, err := DecodeTransactionEvent(cdcEv)
 	require.NoError(t, err)
 	require.IsType(t, TransactionCall{}, decTx)
 
@@ -131,7 +131,7 @@ func Test_DecodeEVMTransaction(t *testing.T) {
 func Test_DecodeDirectCall(t *testing.T) {
 	cdcEv, _ := createTestEvent(t, directCallBinary)
 
-	decTx, _, _, err := decodeTransactionEvent(cdcEv)
+	decTx, _, _, err := DecodeTransactionEvent(cdcEv)
 	require.NoError(t, err)
 	require.IsType(t, DirectCall{}, decTx)
 
@@ -179,7 +179,7 @@ func Test_UnmarshalTransaction(t *testing.T) {
 
 		cdcEv, _ := createTestEvent(t, evmTxBinary)
 
-		tx, _, _, err := decodeTransactionEvent(cdcEv)
+		tx, _, _, err := DecodeTransactionEvent(cdcEv)
 		require.NoError(t, err)
 
 		encodedTx, err := tx.MarshalBinary()
@@ -233,7 +233,7 @@ func Test_UnmarshalTransaction(t *testing.T) {
 
 		cdcEv, _ := createTestEvent(t, directCallBinary)
 
-		tx, _, _, err := decodeTransactionEvent(cdcEv)
+		tx, _, _, err := DecodeTransactionEvent(cdcEv)
 		require.NoError(t, err)
 
 		encodedTx, err := tx.MarshalBinary()
@@ -277,7 +277,6 @@ func Test_UnmarshalTransaction(t *testing.T) {
 		assert.Equal(t, uint64(0), decTx.BlobGas())
 		assert.Equal(t, uint64(61), decTx.Size())
 	})
-
 }
 
 func TestValidateTransaction(t *testing.T) {
@@ -406,11 +405,9 @@ func TestValidateTransaction(t *testing.T) {
 			}
 		})
 	}
-
 }
 
 func TestValidateConsensusRules(t *testing.T) {
-
 	head := &gethTypes.Header{
 		Number:     big.NewInt(20_182_324),
 		Time:       uint64(time.Now().Unix()),