Skip to content

Commit

Permalink
dependencies for server
Browse files Browse the repository at this point in the history
  • Loading branch information
cyberhorsey committed Jul 1, 2024
1 parent 7951c8a commit 1bb3e58
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 23 deletions.
4 changes: 2 additions & 2 deletions packages/taiko-client/proposer/proposer.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down
24 changes: 8 additions & 16 deletions packages/taiko-client/proposer/server/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand All @@ -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
Expand Down
6 changes: 1 addition & 5 deletions packages/taiko-client/proposer/server/server_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down

0 comments on commit 1bb3e58

Please sign in to comment.