diff --git a/cmd/serve.go b/cmd/serve.go index c3d6b4a1..caa937fc 100644 --- a/cmd/serve.go +++ b/cmd/serve.go @@ -77,17 +77,17 @@ func serve() { } func startServers(server s.Server, settings *s.Config) error { - logWithCommand.Debug("starting up IPC server") + logWithCommand.Info("starting up IPC server") _, _, err := rpc.StartIPCEndpoint(settings.IPCEndpoint, server.APIs()) if err != nil { return err } - logWithCommand.Debug("starting up WS server") + logWithCommand.Info("starting up WS server") _, _, err = rpc.StartWSEndpoint(settings.WSEndpoint, server.APIs(), []string{"vdb"}, nil, true) if err != nil { return err } - logWithCommand.Debug("starting up HTTP server") + logWithCommand.Info("starting up HTTP server") _, _, err = rpc.StartHTTPEndpoint(settings.HTTPEndpoint, server.APIs(), []string{"eth"}, nil, nil, rpc.HTTPTimeouts{}) return err } diff --git a/cmd/subscribe.go b/cmd/subscribe.go index abe5e93d..563ff4fa 100644 --- a/cmd/subscribe.go +++ b/cmd/subscribe.go @@ -70,11 +70,7 @@ func subscribe() { payloadChan := make(chan w.SubscriptionPayload, 20000) // Subscribe to the watcher service with the given config/filter parameters - rlpParams, err := rlp.EncodeToBytes(ethSubConfig) - if err != nil { - logWithCommand.Fatal(err) - } - sub, err := subClient.Stream(payloadChan, rlpParams) + sub, err := subClient.Stream(payloadChan, *ethSubConfig) if err != nil { logWithCommand.Fatal(err) } diff --git a/pkg/client/client.go b/pkg/client/client.go index 3ffb296f..729c1185 100644 --- a/pkg/client/client.go +++ b/pkg/client/client.go @@ -20,6 +20,8 @@ package client import ( "context" + "github.com/vulcanize/ipld-eth-server/pkg/eth" + "github.com/ethereum/go-ethereum/rpc" "github.com/vulcanize/ipld-eth-server/pkg/serve" @@ -38,6 +40,6 @@ func NewClient(c *rpc.Client) *Client { } // Stream is the main loop for subscribing to iplds from an ipld-eth-server server -func (c *Client) Stream(payloadChan chan serve.SubscriptionPayload, rlpParams []byte) (*rpc.ClientSubscription, error) { - return c.c.Subscribe(context.Background(), "vdb", payloadChan, "stream", rlpParams) +func (c *Client) Stream(payloadChan chan serve.SubscriptionPayload, params eth.SubscriptionSettings) (*rpc.ClientSubscription, error) { + return c.c.Subscribe(context.Background(), "vdb", payloadChan, "stream", params) }