Revert "New attempt"

This reverts commit d853327.

Author: KolbyML

arbitrum/apibackend.go

@@ -150,14 +150,8 @@ func createRegisterAPIBackend(backend *Backend, filterConfig filters.Config, fal
 		archiveClientsManager: archiveClientsManager,
 	}
 	filterSystem := filters.NewFilterSystem(backend.apiBackend, filterConfig)
-	apis := backend.apiBackend.GetAPIs(filterSystem)
-	backend.stack.RegisterAPIs(apis.Slice())
-
-	service := apis.EthAPIs.TransactionAPI.Service
-	receiptFetcher, ok := service.(ReceiptFetcher)
-	if !ok {
-		return nil, nil, fmt.Errorf("TransactionAPI.Service does not implement ReceiptFetcher")
-	}
+	apis, receiptFetcher := backend.apiBackend.GetAPIs(filterSystem)
+	backend.stack.RegisterAPIs(apis)
 	return filterSystem, receiptFetcher, nil
 }
 
@@ -169,35 +163,40 @@ func (a *APIBackend) SetSyncBackend(sync SyncProgressBackend) error {
 	return nil
 }
 
-func (a *APIBackend) GetAPIs(filterSystem *filters.FilterSystem) APIs {
-	return APIs{
-		EthAPIs: ethapi.GetAPIs(a),
-		FilterAPI: rpc.API{
-			Namespace: "eth",
-			Version:   "1.0",
-			Service:   filters.NewFilterAPI(filterSystem),
-			Public:    true,
-		},
-		ArbTransactionAPI: rpc.API{
-			Namespace: "eth",
-			Version:   "1.0",
-			Service:   NewArbTransactionAPI(a),
-			Public:    true,
-		},
-		PublicNetAPI: rpc.API{
-			Namespace: "net",
-			Version:   "1.0",
-			Service:   NewPublicNetAPI(a.ChainConfig().ChainID.Uint64()),
-			Public:    true,
-		},
-		PublicTxPoolAPI: rpc.API{
-			Namespace: "txpool",
-			Version:   "1.0",
-			Service:   NewPublicTxPoolAPI(),
-			Public:    true,
-		},
-		TracersAPIs: tracers.APIs(a),
-	}
+func (a *APIBackend) GetAPIs(filterSystem *filters.FilterSystem) ([]rpc.API, ReceiptFetcher) {
+	apis, transactionAPI := ethapi.GetAPIs(a)
+
+	apis = append(apis, rpc.API{
+		Namespace: "eth",
+		Version:   "1.0",
+		Service:   filters.NewFilterAPI(filterSystem),
+		Public:    true,
+	})
+
+	apis = append(apis, rpc.API{
+		Namespace: "eth",
+		Version:   "1.0",
+		Service:   NewArbTransactionAPI(a),
+		Public:    true,
+	})
+
+	apis = append(apis, rpc.API{
+		Namespace: "net",
+		Version:   "1.0",
+		Service:   NewPublicNetAPI(a.ChainConfig().ChainID.Uint64()),
+		Public:    true,
+	})
+
+	apis = append(apis, rpc.API{
+		Namespace: "txpool",
+		Version:   "1.0",
+		Service:   NewPublicTxPoolAPI(),
+		Public:    true,
+	})
+
+	apis = append(apis, tracers.APIs(a)...)
+
+	return apis, transactionAPI
 }
 
 func (a *APIBackend) BlockChain() *core.BlockChain {

arbitrum/apis.go

@@ -394,7 +394,7 @@ func makeExtraData(extra []byte) []byte {
 // APIs return the collection of RPC services the ethereum package offers.
 // NOTE, some of these services probably need to be moved to somewhere else.
 func (s *Ethereum) APIs() []rpc.API {
-	apis := ethapi.GetAPIs(s.APIBackend).Slice()
+	apis, _ := ethapi.GetAPIs(s.APIBackend)
 
 	// Append all the local APIs and return
 	return append(apis, []rpc.API{

eth/backend.go

@@ -108,52 +108,28 @@ type Backend interface {
 	NewMatcherBackend() filtermaps.MatcherBackend
 }
 
-func GetAPIs(apiBackend Backend) APIs {
+func GetAPIs(apiBackend Backend) ([]rpc.API, *TransactionAPI) {
 	nonceLock := new(AddrLocker)
-	return APIs{
-		EthereumAPI: rpc.API{
+	transactionAPI := NewTransactionAPI(apiBackend, nonceLock)
+	return []rpc.API{
+		{
 			Namespace: "eth",
 			Service:   NewEthereumAPI(apiBackend),
-		},
-		BlockChainAPI: rpc.API{
+		}, {
 			Namespace: "eth",
 			Service:   NewBlockChainAPI(apiBackend),
-		},
-		TransactionAPI: rpc.API{
+		}, {
 			Namespace: "eth",
-			Service:   NewTransactionAPI(apiBackend, nonceLock),
-		},
-		TxPoolAPI: rpc.API{
+			Service:   transactionAPI,
+		}, {
 			Namespace: "txpool",
 			Service:   NewTxPoolAPI(apiBackend),
-		},
-		DebugAPI: rpc.API{
+		}, {
 			Namespace: "debug",
 			Service:   NewDebugAPI(apiBackend),
-		},
-		EthereumAccountAPI: rpc.API{
+		}, {
 			Namespace: "eth",
 			Service:   NewEthereumAccountAPI(apiBackend.AccountManager()),
 		},
-	}
-}
-
-type APIs struct {
-	EthereumAPI        rpc.API
-	BlockChainAPI      rpc.API
-	TransactionAPI     rpc.API
-	TxPoolAPI          rpc.API
-	DebugAPI           rpc.API
-	EthereumAccountAPI rpc.API
-}
-
-func (a APIs) Slice() []rpc.API {
-	return []rpc.API{
-		a.EthereumAPI,
-		a.BlockChainAPI,
-		a.TransactionAPI,
-		a.TxPoolAPI,
-		a.DebugAPI,
-		a.EthereumAccountAPI,
-	}
+	}, transactionAPI
 }