nits

ava-labs · Mar 27, 2024 · 81685d5 · 81685d5
1 parent 0a3f2d5
commit 81685d5
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 30 deletions.
diff --git a/cmd/server/main.go b/cmd/server/main.go
@@ -136,7 +136,6 @@ func main() {
 	}
 
 	pChainBackend, err := pchain.NewBackend(
-		cfg.Mode,
 		pChainClient,
 		pIndexerParser,
 		avaxAssetID,

diff --git a/service/backend/pchain/account_test.go b/service/backend/pchain/account_test.go
@@ -17,7 +17,6 @@ import (
 	"github.com/ava-labs/avalanche-rosetta/client"
 	"github.com/ava-labs/avalanche-rosetta/constants"
 	"github.com/ava-labs/avalanche-rosetta/mapper"
-	"github.com/ava-labs/avalanche-rosetta/service"
 	"github.com/ava-labs/avalanche-rosetta/service/backend/pchain/indexer"
 
 	pmapper "github.com/ava-labs/avalanche-rosetta/mapper/pchain"
@@ -56,7 +55,6 @@ func TestAccountBalance(t *testing.T) {
 	parserMock.EXPECT().GetGenesisBlock(ctx).Return(dummyGenesis, nil)
 	parserMock.EXPECT().ParseNonGenesisBlock(ctx, "", blockHeight).Return(parsedBlock, nil).AnyTimes()
 	backend, err := NewBackend(
-		service.ModeOnline,
 		pChainMock,
 		parserMock,
 		avaxAssetID,
@@ -255,7 +253,6 @@ func TestAccountPendingRewardsBalance(t *testing.T) {
 	}
 
 	backend, err := NewBackend(
-		service.ModeOnline,
 		pChainMock,
 		parserMock,
 		avaxAssetID,
@@ -361,7 +358,6 @@ func TestAccountCoins(t *testing.T) {
 	parserMock.EXPECT().GetGenesisBlock(ctx).Return(dummyGenesis, nil)
 	parserMock.EXPECT().ParseNonGenesisBlock(ctx, "", blockHeight).Return(parsedBlock, nil).AnyTimes()
 	backend, err := NewBackend(
-		service.ModeOnline,
 		pChainMock,
 		parserMock,
 		avaxAssetID,

diff --git a/service/backend/pchain/backend.go b/service/backend/pchain/backend.go
@@ -38,10 +38,9 @@ type Backend struct {
 
 // NewBackend creates a P-chain service backend
 func NewBackend(
-	nodeMode string,
 	pClient client.PChainClient,
 	indexerParser indexer.Parser,
-	assetID ids.ID,
+	avaxAssetID ids.ID,
 	networkIdentifier *types.NetworkIdentifier,
 	avalancheNetworkID uint32,
 ) (*Backend, error) {
@@ -50,29 +49,29 @@ func NewBackend(
 		return nil, err
 	}
 
+	networkHRP, err := mapper.GetHRP(networkIdentifier)
+	if err != nil {
+		return nil, err
+	}
+
 	b := &Backend{
 		genesisHandler:     genHandler,
 		networkID:          networkIdentifier,
+		networkHRP:         networkHRP,
+		avalancheNetworkID: avalancheNetworkID,
 		pClient:            pClient,
+		indexerParser:      indexerParser,
 		getUTXOsPageSize:   1024,
 		codec:              block.Codec,
 		codecVersion:       block.CodecVersion,
-		indexerParser:      indexerParser,
-		avaxAssetID:        assetID,
-		avalancheNetworkID: avalancheNetworkID,
-	}
-
-	b.networkHRP, err = mapper.GetHRP(b.networkID)
-	if err != nil {
-		return nil, err
-	}
-
-	b.txParserCfg = pmapper.TxParserConfig{
-		IsConstruction: false,
-		Hrp:            b.networkHRP,
-		ChainIDs:       nil,
-		AvaxAssetID:    b.avaxAssetID,
-		PChainClient:   b.pClient,
+		avaxAssetID:        avaxAssetID,
+		txParserCfg: pmapper.TxParserConfig{
+			IsConstruction: false,
+			Hrp:            networkHRP,
+			ChainIDs:       nil,
+			AvaxAssetID:    avaxAssetID,
+			PChainClient:   pClient,
+		},
 	}
 
 	return b, nil

diff --git a/service/backend/pchain/backend_test.go b/service/backend/pchain/backend_test.go
@@ -35,7 +35,6 @@ func TestShouldHandleRequest(t *testing.T) {
 	parserMock := indexer.NewMockParser(ctrl)
 	parserMock.EXPECT().GetGenesisBlock(ctx).Return(dummyGenesis, nil)
 	backend, err := NewBackend(
-		service.ModeOnline,
 		clientMock,
 		parserMock,
 		avaxAssetID,

diff --git a/service/backend/pchain/block_test.go b/service/backend/pchain/block_test.go
@@ -99,7 +99,7 @@ func TestFetchBlkDependencies(t *testing.T) {
 		Encoding: formatting.Hex,
 	}).Return(nil, nil)
 
-	backend, err := NewBackend(service.ModeOnline, mockPClient, mockIndexerParser, avaxAssetID, networkIdentifier, networkID)
+	backend, err := NewBackend(mockPClient, mockIndexerParser, avaxAssetID, networkIdentifier, networkID)
 	require.NoError(t, err)
 
 	deps, err := backend.fetchBlkDependencies(ctx, []*txs.Tx{tx})

diff --git a/service/backend/pchain/construction_test.go b/service/backend/pchain/construction_test.go
@@ -72,7 +72,6 @@ func TestConstructionDerive(t *testing.T) {
 	parserMock := indexer.NewMockParser(ctrl)
 	parserMock.EXPECT().GetGenesisBlock(ctx).Return(dummyGenesis, nil)
 	backend, err := NewBackend(
-		service.ModeOnline,
 		pChainMock,
 		parserMock,
 		avaxAssetID,
@@ -193,7 +192,6 @@ func TestExportTxConstruction(t *testing.T) {
 	parserMock := indexer.NewMockParser(ctrl)
 	parserMock.EXPECT().GetGenesisBlock(ctx).Return(dummyGenesis, nil)
 	backend, err := NewBackend(
-		service.ModeOnline,
 		clientMock,
 		parserMock,
 		avaxAssetID,
@@ -404,7 +402,6 @@ func TestImportTxConstruction(t *testing.T) {
 	parserMock := indexer.NewMockParser(ctrl)
 	parserMock.EXPECT().GetGenesisBlock(ctx).Return(dummyGenesis, nil)
 	backend, err := NewBackend(
-		service.ModeOnline,
 		clientMock,
 		parserMock,
 		avaxAssetID,
@@ -645,7 +642,6 @@ func TestAddValidatorTxConstruction(t *testing.T) {
 	parserMock := indexer.NewMockParser(ctrl)
 	parserMock.EXPECT().GetGenesisBlock(ctx).Return(dummyGenesis, nil)
 	backend, err := NewBackend(
-		service.ModeOnline,
 		clientMock,
 		parserMock,
 		avaxAssetID,
@@ -880,7 +876,6 @@ func TestAddDelegatorTxConstruction(t *testing.T) {
 	parserMock := indexer.NewMockParser(ctrl)
 	parserMock.EXPECT().GetGenesisBlock(ctx).Return(dummyGenesis, nil)
 	backend, err := NewBackend(
-		service.ModeOnline,
 		clientMock,
 		parserMock,
 		avaxAssetID,