node: remove unused error return from Attach (#27450)

node: Delete the unused error from return parameters of Node.Attach() func
pull/27472/head
Sanghee Choi 1 year ago committed by GitHub
parent 6f08c2f3f1
commit acc2a2ac61
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 6
      cmd/faucet/faucet.go
  2. 5
      cmd/geth/consolecmd.go
  3. 5
      cmd/geth/main.go
  4. 5
      console/console_test.go
  5. 2
      ethclient/ethclient_test.go
  6. 5
      ethclient/gethclient/gethclient_test.go
  7. 4
      node/node.go
  8. 7
      p2p/simulations/adapters/inproc.go

@ -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{

@ -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),

@ -346,10 +346,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() {

@ -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)

@ -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()

@ -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()

@ -616,8 +616,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.

@ -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
@ -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()

Loading…
Cancel
Save