From 1bb3e58a3f76bd2d622c9bdb7886dc75274b20b8 Mon Sep 17 00:00:00 2001 From: Jeffery Walsh Date: Mon, 1 Jul 2024 14:50:06 -0700 Subject: [PATCH] dependencies for server --- packages/taiko-client/proposer/proposer.go | 4 ++-- .../taiko-client/proposer/server/server.go | 24 +++++++------------ .../proposer/server/server_test.go | 6 +---- 3 files changed, 11 insertions(+), 23 deletions(-) diff --git a/packages/taiko-client/proposer/proposer.go b/packages/taiko-client/proposer/proposer.go index 9e42d65e4b..b22827babf 100644 --- a/packages/taiko-client/proposer/proposer.go +++ b/packages/taiko-client/proposer/proposer.go @@ -165,8 +165,8 @@ func (p *Proposer) InitFromConfig(ctx context.Context, cfg *Config, txMgr *txmgr // Prover server if p.server, err = server.New(&server.NewProposerServerOpts{ - RPC: p.rpc, - ProtocolConfigs: &protocolConfigs, + RPC: p.rpc, + TxBuilder: p.txBuilder, }); err != nil { return err } diff --git a/packages/taiko-client/proposer/server/server.go b/packages/taiko-client/proposer/server/server.go index 036d1cafc0..c1ab8267bb 100644 --- a/packages/taiko-client/proposer/server/server.go +++ b/packages/taiko-client/proposer/server/server.go @@ -8,8 +8,6 @@ import ( "github.com/labstack/echo/v4" "github.com/labstack/echo/v4/middleware" - "github.com/taikoxyz/taiko-mono/packages/taiko-client/bindings" - "github.com/taikoxyz/taiko-mono/packages/taiko-client/bindings/encoding" "github.com/taikoxyz/taiko-mono/packages/taiko-client/pkg/rpc" builder "github.com/taikoxyz/taiko-mono/packages/taiko-client/proposer/transaction_builder" ) @@ -26,29 +24,23 @@ import ( // @license.url https://github.com/taikoxyz/taiko-mono/blob/main/LICENSE.md // ProposerServer represents a proposer server instance. type ProposerServer struct { - echo *echo.Echo - rpc *rpc.Client - protocolConfigs *bindings.TaikoDataConfig - txBuilder builder.ProposeBlockTransactionBuilder - tierFees []encoding.TierFee + echo *echo.Echo + rpc *rpc.Client + txBuilder builder.ProposeBlockTransactionBuilder } // NewProposerServerOpts contains all configurations for creating a prover server instance. type NewProposerServerOpts struct { - RPC *rpc.Client - ProtocolConfigs *bindings.TaikoDataConfig - TxBuilder builder.ProposeBlockTransactionBuilder - TierFees []encoding.TierFee + RPC *rpc.Client + TxBuilder builder.ProposeBlockTransactionBuilder } // New creates a new prover server instance. func New(opts *NewProposerServerOpts) (*ProposerServer, error) { srv := &ProposerServer{ - echo: echo.New(), - rpc: opts.RPC, - protocolConfigs: opts.ProtocolConfigs, - txBuilder: opts.TxBuilder, - tierFees: opts.TierFees, + echo: echo.New(), + rpc: opts.RPC, + txBuilder: opts.TxBuilder, } srv.echo.HideBanner = true diff --git a/packages/taiko-client/proposer/server/server_test.go b/packages/taiko-client/proposer/server/server_test.go index 80873cd971..2693c6cd5c 100644 --- a/packages/taiko-client/proposer/server/server_test.go +++ b/packages/taiko-client/proposer/server/server_test.go @@ -39,12 +39,8 @@ func (s *ProposerServerTestSuite) SetupTest() { }) s.Nil(err) - configs, err := rpcClient.TaikoL1.GetConfig(nil) - s.Nil(err) - p, err := New(&NewProposerServerOpts{ - RPC: rpcClient, - ProtocolConfigs: &configs, + RPC: rpcClient, }) s.Nil(err)