Skip to content

Commit

Permalink
chore: naming changes
Browse files Browse the repository at this point in the history
  • Loading branch information
jim380 committed Oct 30, 2024
1 parent 594f3f9 commit e845c33
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
8 changes: 4 additions & 4 deletions execution_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"github.com/ethereum/go-ethereum/common"
"github.com/rollkit/go-execution-evm/proxy"
"github.com/rollkit/go-execution/mocks"
proxyJsonrpc "github.com/rollkit/go-execution/proxy/jsonrpc"
proxy_json_rpc "github.com/rollkit/go-execution/proxy/jsonrpc"
rollkitTypes "github.com/rollkit/rollkit/types"
"github.com/stretchr/testify/require"
)
Expand All @@ -23,7 +23,7 @@ type testEnv struct {
jwtSecret string
cleanup func()
client *EngineAPIExecutionClient
proxyConf *proxyJsonrpc.Config
proxyConf *proxy_json_rpc.Config
mockExec *mocks.MockExecute
}

Expand All @@ -38,7 +38,7 @@ func setupTestEnv(t *testing.T) *testEnv {
}

// setup a proxy config
proxyConf := &proxyJsonrpc.Config{
proxyConf := &proxy_json_rpc.Config{
DefaultTimeout: 5 * time.Second,
MaxRequestSize: 1024 * 1024,
}
Expand All @@ -47,7 +47,7 @@ func setupTestEnv(t *testing.T) *testEnv {
mockExec := mocks.NewMockExecute(t)

// create a proxy server with mock execute
server := proxyJsonrpc.NewServer(mockExec, proxyConf)
server := proxy_json_rpc.NewServer(mockExec, proxyConf)
testServer := httptest.NewServer(server)

// create a proxy client that implements the Execute interface
Expand Down
8 changes: 4 additions & 4 deletions proxy/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
"github.com/ethereum/go-ethereum/ethclient"
"github.com/ethereum/go-ethereum/rpc"
"github.com/rollkit/go-execution"
proxyJsonrpc "github.com/rollkit/go-execution/proxy/jsonrpc"
proxy_json_rpc "github.com/rollkit/go-execution/proxy/jsonrpc"
rollkitTypes "github.com/rollkit/rollkit/types"
)

Expand All @@ -34,15 +34,15 @@ var _ execution.Execute = (*ProxyClient)(nil)

// ProxyClient implements the Execute interface in go-execution
type ProxyClient struct {
client *proxyJsonrpc.Client
client *proxy_json_rpc.Client
engineClient *rpc.Client // engine api
ethClient *ethclient.Client
genesisHash common.Hash
feeRecipient common.Address
}

func NewClient(config *proxyJsonrpc.Config, ethURL, engineURL string, genesisHash common.Hash, feeRecipient common.Address) (*ProxyClient, error) {
client := proxyJsonrpc.NewClient()
func NewClient(config *proxy_json_rpc.Config, ethURL, engineURL string, genesisHash common.Hash, feeRecipient common.Address) (*ProxyClient, error) {
client := proxy_json_rpc.NewClient()
client.SetConfig(config)

ethClient, err := ethclient.Dial(ethURL)
Expand Down

0 comments on commit e845c33

Please sign in to comment.