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.

Sign up for GitHub

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

all: remove version field #25096

Merged
merged 1 commit into from
Jul 14, 2022
Merged

all: remove version field #25096

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cmd/clef/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -648,7 +648,7 @@ func signer(c *cli.Context) error {
{
Namespace: "account",
Service: api,
Version: "1.0"},
},
}
if c.GlobalBool(utils.HTTPEnabledFlag.Name) {
vhosts := utils.SplitAndTrim(c.GlobalString(utils.HTTPVirtualHostsFlag.Name))
Expand Down
1 change: 0 additions & 1 deletion consensus/clique/clique.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -697,7 +697,6 @@ func (c *Clique) Close() error {
func (c *Clique) APIs(chain consensus.ChainHeaderReader) []rpc.API {
return []rpc.API{{
Namespace: "clique",
Version: "1.0",
Service: &API{chain: chain, clique: c},
}}
}
Expand Down
2 changes: 0 additions & 2 deletions consensus/ethash/ethash.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -678,12 +678,10 @@ func (ethash *Ethash) APIs(chain consensus.ChainHeaderReader) []rpc.API {
return []rpc.API{
{
Namespace: "eth",
Version: "1.0",
Service: &API{ethash},
},
{
Namespace: "ethash",
Version: "1.0",
Service: &API{ethash},
},
}
Expand Down
7 changes: 0 additions & 7 deletions eth/backend.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -308,31 +308,24 @@ func (s *Ethereum) APIs() []rpc.API {
return append(apis, []rpc.API{
{
Namespace: "eth",
Version: "1.0",
Service: NewEthereumAPI(s),
}, {
Namespace: "miner",
Version: "1.0",
Service: NewMinerAPI(s),
}, {
Namespace: "eth",
Version: "1.0",
Service: downloader.NewDownloaderAPI(s.handler.downloader, s.eventMux),
}, {
Namespace: "eth",
Version: "1.0",
Service: filters.NewFilterAPI(s.APIBackend, false, 5*time.Minute),
}, {
Namespace: "admin",
Version: "1.0",
Service: NewAdminAPI(s),
}, {
Namespace: "debug",
Version: "1.0",
Service: NewDebugAPI(s),
}, {
Namespace: "net",
Version: "1.0",
Service: s.netRPCService,
},
}...)
Expand Down
1 change: 0 additions & 1 deletion eth/catalyst/api.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ func Register(stack *node.Node, backend *eth.Ethereum) error {
stack.RegisterAPIs([]rpc.API{
{
Namespace: "engine",
Version: "1.0",
Service: NewConsensusAPI(backend),
Authenticated: true,
},
Expand Down
1 change: 0 additions & 1 deletion eth/tracers/api.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -918,7 +918,6 @@ func APIs(backend Backend) []rpc.API {
return []rpc.API{
{
Namespace: "debug",
Version: "1.0",
Service: NewAPI(backend),
},
}
Expand Down
7 changes: 0 additions & 7 deletions internal/ethapi/backend.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,31 +101,24 @@ func GetAPIs(apiBackend Backend) []rpc.API {
return []rpc.API{
{
Namespace: "eth",
Version: "1.0",
Service: NewEthereumAPI(apiBackend),
}, {
Namespace: "eth",
Version: "1.0",
Service: NewBlockChainAPI(apiBackend),
}, {
Namespace: "eth",
Version: "1.0",
Service: NewTransactionAPI(apiBackend, nonceLock),
}, {
Namespace: "txpool",
Version: "1.0",
Service: NewTxPoolAPI(apiBackend),
}, {
Namespace: "debug",
Version: "1.0",
Service: NewDebugAPI(apiBackend),
}, {
Namespace: "eth",
Version: "1.0",
Service: NewEthereumAccountAPI(apiBackend.AccountManager()),
}, {
Namespace: "personal",
Version: "1.0",
Service: NewPersonalAccountAPI(apiBackend, nonceLock),
},
}
Expand Down
1 change: 0 additions & 1 deletion les/catalyst/api.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ func Register(stack *node.Node, backend *les.LightEthereum) error {
stack.RegisterAPIs([]rpc.API{
{
Namespace: "engine",
Version: "1.0",
Service: NewConsensusAPI(backend),
Authenticated: true,
},
Expand Down
6 changes: 0 additions & 6 deletions les/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,27 +294,21 @@ func (s *LightEthereum) APIs() []rpc.API {
return append(apis, []rpc.API{
{
Namespace: "eth",
Version: "1.0",
Service: &LightDummyAPI{},
}, {
Namespace: "eth",
Version: "1.0",
Service: downloader.NewDownloaderAPI(s.handler.downloader, s.eventMux),
}, {
Namespace: "eth",
Version: "1.0",
Service: filters.NewFilterAPI(s.ApiBackend, true, 5*time.Minute),
}, {
Namespace: "net",
Version: "1.0",
Service: s.netRPCService,
}, {
Namespace: "les",
Version: "1.0",
Service: NewLightAPI(&s.lesCommons),
}, {
Namespace: "vflux",
Version: "1.0",
Service: s.serverPool.API(),
},
}...)
Expand Down
3 changes: 0 additions & 3 deletions les/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,17 +159,14 @@ func (s *LesServer) APIs() []rpc.API {
return []rpc.API{
{
Namespace: "les",
Version: "1.0",
Service: NewLightAPI(&s.lesCommons),
},
{
Namespace: "les",
Version: "1.0",
Service: NewLightServerAPI(s),
},
{
Namespace: "debug",
Version: "1.0",
Service: NewDebugAPI(s),
},
}
Expand Down
3 changes: 0 additions & 3 deletions node/api.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,15 +35,12 @@ func (n *Node) apis() []rpc.API {
return []rpc.API{
{
Namespace: "admin",
Version: "1.0",
Service: &adminAPI{n},
}, {
Namespace: "debug",
Version: "1.0",
Service: debug.Handler,
}, {
Namespace: "web3",
Version: "1.0",
Service: &web3API{n},
},
}
Expand Down
3 changes: 0 additions & 3 deletions node/utils_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,15 +95,12 @@ func (f *FullService) APIs() []rpc.API {
return []rpc.API{
{
Namespace: "admin",
Version: "1.0",
},
{
Namespace: "debug",
Version: "1.0",
},
{
Namespace: "net",
Version: "1.0",
},
}
}
1 change: 0 additions & 1 deletion p2p/simulations/adapters/exec.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -501,7 +501,6 @@ func startExecNodeStack() (*node.Node, error) {
// Add the snapshot API.
stack.RegisterAPIs([]rpc.API{{
Namespace: "simulation",
Version: "1.0",
Service: SnapshotAPI{services},
}})

Expand Down
2 changes: 1 addition & 1 deletion rpc/types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ import (
// API describes the set of methods offered over the RPC interface
type API struct {
Namespace string // namespace under which the rpc methods of Service are exposed
Version string // api version for DApp's
Version string // deprecated - this field is no longer used, but retained for compatibility
Service interface{} // receiver instance which holds the methods
Public bool // deprecated - this field is no longer used, but retained for compatibility
Authenticated bool // whether the api should only be available behind authentication.
Expand Down