Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

node: remove unused error return from Attach #27450

Merged
merged 1 commit into from Jun 14, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 1 addition & 5 deletions cmd/faucet/faucet.go
Expand Up @@ -268,11 +268,7 @@ func newFaucet(genesis *core.Genesis, port int, enodes []*enode.Node, network ui
}
}
// Attach to the client and retrieve and interesting metadatas
api, err := stack.Attach()
if err != nil {
stack.Close()
return nil, err
}
api := stack.Attach()
client := ethclient.NewClient(api)

return &faucet{
Expand Down
5 changes: 1 addition & 4 deletions cmd/geth/consolecmd.go
Expand Up @@ -75,10 +75,7 @@ func localConsole(ctx *cli.Context) error {
defer stack.Close()

// Attach to the newly started node and create the JavaScript console.
client, err := stack.Attach()
if err != nil {
return fmt.Errorf("failed to attach to the inproc geth: %v", err)
}
client := stack.Attach()
config := console.Config{
DataDir: utils.MakeDataDir(ctx),
DocRoot: ctx.String(utils.JSpathFlag.Name),
Expand Down
5 changes: 1 addition & 4 deletions cmd/geth/main.go
Expand Up @@ -344,10 +344,7 @@ func startNode(ctx *cli.Context, stack *node.Node, backend ethapi.Backend, isCon
stack.AccountManager().Subscribe(events)

// Create a client to interact with local geth node.
rpcClient, err := stack.Attach()
if err != nil {
utils.Fatalf("Failed to attach to self: %v", err)
}
rpcClient := stack.Attach()
ethClient := ethclient.NewClient(rpcClient)

go func() {
Expand Down
5 changes: 1 addition & 4 deletions console/console_test.go
Expand Up @@ -110,10 +110,7 @@ func newTester(t *testing.T, confOverride func(*ethconfig.Config)) *tester {
if err = stack.Start(); err != nil {
t.Fatalf("failed to start test stack: %v", err)
}
client, err := stack.Attach()
if err != nil {
t.Fatalf("failed to attach to node: %v", err)
}
client := stack.Attach()
prompter := &hookedPrompter{scheduler: make(chan string)}
printer := new(bytes.Buffer)

Expand Down
2 changes: 1 addition & 1 deletion ethclient/ethclient_test.go
Expand Up @@ -250,7 +250,7 @@ func generateTestChain() []*types.Block {

func TestEthClient(t *testing.T) {
backend, chain := newTestBackend(t)
client, _ := backend.Attach()
client := backend.Attach()
defer backend.Close()
defer client.Close()

Expand Down
5 changes: 1 addition & 4 deletions ethclient/gethclient/gethclient_test.go
Expand Up @@ -94,10 +94,7 @@ func generateTestChain() (*core.Genesis, []*types.Block) {

func TestGethClient(t *testing.T) {
backend, _ := newTestBackend(t)
client, err := backend.Attach()
if err != nil {
t.Fatal(err)
}
client := backend.Attach()
defer backend.Close()
defer client.Close()

Expand Down
4 changes: 2 additions & 2 deletions node/node.go
Expand Up @@ -605,8 +605,8 @@ func (n *Node) RegisterHandler(name, path string, handler http.Handler) {
}

// Attach creates an RPC client attached to an in-process API handler.
func (n *Node) Attach() (*rpc.Client, error) {
return rpc.DialInProc(n.inprocHandler), nil
func (n *Node) Attach() *rpc.Client {
return rpc.DialInProc(n.inprocHandler)
}

// RPCHandler returns the in-process RPC request handler.
Expand Down
7 changes: 2 additions & 5 deletions p2p/simulations/adapters/inproc.go
Expand Up @@ -147,7 +147,7 @@ func (s *SimAdapter) DialRPC(id enode.ID) (*rpc.Client, error) {
if !ok {
return nil, fmt.Errorf("unknown node: %s", id)
}
return node.node.Attach()
return node.node.Attach(), nil
}

// GetNode returns the node with the given ID if it exists
Expand Down Expand Up @@ -274,10 +274,7 @@ func (sn *SimNode) Start(snapshots map[string][]byte) error {
}

// create an in-process RPC client
client, err := sn.node.Attach()
if err != nil {
return err
}
client := sn.node.Attach()
sn.lock.Lock()
sn.client = client
sn.lock.Unlock()
Expand Down