diff options
| author | Felix Lange <fjl@twurst.com> | 2015-12-15 00:38:10 +0800 |
|---|---|---|
| committer | Felix Lange <fjl@twurst.com> | 2015-12-15 00:38:10 +0800 |
| commit | fa187a366dda1894179635eeec2a929bfacc4ad3 (patch) | |
| tree | 4494d4dcded47dd49f2fe7374e85fefa9249246e /rpc/api/mergedapi.go | |
| parent | 787d71d6595df98586c625e82f4decb034215203 (diff) | |
| parent | eae81465c1c815c317cd30e4de6bdf4d59df2340 (diff) | |
| download | dexon-fa187a366dda1894179635eeec2a929bfacc4ad3.tar dexon-fa187a366dda1894179635eeec2a929bfacc4ad3.tar.gz dexon-fa187a366dda1894179635eeec2a929bfacc4ad3.tar.bz2 dexon-fa187a366dda1894179635eeec2a929bfacc4ad3.tar.lz dexon-fa187a366dda1894179635eeec2a929bfacc4ad3.tar.xz dexon-fa187a366dda1894179635eeec2a929bfacc4ad3.tar.zst dexon-fa187a366dda1894179635eeec2a929bfacc4ad3.zip | |
Merge pull request #2035 from bas-vk/rcp-v2-rebase
rpc: new RPC implementation with pub/sub support
Diffstat (limited to 'rpc/api/mergedapi.go')
| -rw-r--r-- | rpc/api/mergedapi.go | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/rpc/api/mergedapi.go b/rpc/api/mergedapi.go index 8f4ef8e60..92e1e2bb7 100644 --- a/rpc/api/mergedapi.go +++ b/rpc/api/mergedapi.go @@ -39,9 +39,11 @@ func newMergedApi(apis ...shared.EthereumApi) *MergedApi { mergedApi.methods = make(map[string]shared.EthereumApi) for _, api := range apis { - mergedApi.apis[api.Name()] = api.ApiVersion() - for _, method := range api.Methods() { - mergedApi.methods[method] = api + if api != nil { + mergedApi.apis[api.Name()] = api.ApiVersion() + for _, method := range api.Methods() { + mergedApi.methods[method] = api + } } } return mergedApi |