diff options
| author | Felix Lange <fjl@twurst.com> | 2016-08-18 02:59:59 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-18 02:59:59 +0800 |
| commit | 475521dd747070372f84c2b0ac202e14216dc0e0 (patch) | |
| tree | e97fb7892b21c503a7661578df0ff5a1f6d8e29c /internal/ethapi/backend.go | |
| parent | 3369783e0a3e0c06388cf59fddfd799811381a2b (diff) | |
| parent | 3c09c5f12d21258865677cf565bb9d53a8098d3a (diff) | |
| download | dexon-475521dd747070372f84c2b0ac202e14216dc0e0.tar dexon-475521dd747070372f84c2b0ac202e14216dc0e0.tar.gz dexon-475521dd747070372f84c2b0ac202e14216dc0e0.tar.bz2 dexon-475521dd747070372f84c2b0ac202e14216dc0e0.tar.lz dexon-475521dd747070372f84c2b0ac202e14216dc0e0.tar.xz dexon-475521dd747070372f84c2b0ac202e14216dc0e0.tar.zst dexon-475521dd747070372f84c2b0ac202e14216dc0e0.zip | |
Merge pull request #2909 from fjl/account-manager-cleanup
all: clean up tech debt left behind by the API split
Diffstat (limited to 'internal/ethapi/backend.go')
| -rw-r--r-- | internal/ethapi/backend.go | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/internal/ethapi/backend.go b/internal/ethapi/backend.go index d112a6aef..791a06925 100644 --- a/internal/ethapi/backend.go +++ b/internal/ethapi/backend.go @@ -22,7 +22,6 @@ import ( "github.com/ethereum/go-ethereum/accounts" "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/compiler" "github.com/ethereum/go-ethereum/core" "github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/core/vm" @@ -69,12 +68,13 @@ type State interface { GetNonce(ctx context.Context, addr common.Address) (uint64, error) } -func GetAPIs(apiBackend Backend, solcPath *string, solc **compiler.Solidity) []rpc.API { - return []rpc.API{ +func GetAPIs(apiBackend Backend, solcPath string) []rpc.API { + compiler := makeCompilerAPIs(solcPath) + all := []rpc.API{ { Namespace: "eth", Version: "1.0", - Service: NewPublicEthereumAPI(apiBackend, solcPath, solc), + Service: NewPublicEthereumAPI(apiBackend), Public: true, }, { Namespace: "eth", @@ -92,10 +92,6 @@ func GetAPIs(apiBackend Backend, solcPath *string, solc **compiler.Solidity) []r Service: NewPublicTxPoolAPI(apiBackend), Public: true, }, { - Namespace: "admin", - Version: "1.0", - Service: NewPrivateAdminAPI(apiBackend, solcPath, solc), - }, { Namespace: "debug", Version: "1.0", Service: NewPublicDebugAPI(apiBackend), @@ -116,4 +112,5 @@ func GetAPIs(apiBackend Backend, solcPath *string, solc **compiler.Solidity) []r Public: false, }, } + return append(compiler, all...) } |