aarifullin/neoneo-go
1
0
Fork 0
forked from TrueCloudLab/neoneo-go
Code Pull requests Activity

Merge pull request #3386 from nspcc-dev/getversion

Browse source 
rpcsrv: add SessionEnabled, MaxIteratorResultItems to `getversion`
This commit is contained in:
Anna Shaleva 2024-04-04 10:38:09 +03:00 committed by GitHub
commit b1a986fba8
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 29 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
pkg/neorpc/result/version.go
View file

@ -19,6 +19,13 @@ type (
Nonce uint32 `json:"nonce"` Nonce uint32 `json:"nonce"`
UserAgent string `json:"useragent"` UserAgent string `json:"useragent"`
Protocol Protocol `json:"protocol"` Protocol Protocol `json:"protocol"`
RPC RPC `json:"rpc"`
}
// RPC represents the RPC server configuration.
RPC struct {
MaxIteratorResultItems int `json:"maxiteratorresultitems"`
SessionEnabled bool `json:"sessionenabled"`
} }
// Protocol represents network-dependent parameters. // Protocol represents network-dependent parameters.

12
pkg/neorpc/result/version_test.go
View file

@ -42,6 +42,10 @@ func TestVersion_MarshalUnmarshalJSON(t *testing.T) {
"validatorscount": 7, "validatorscount": 7,
"hardforks": [{"name": "Aspidochelone", "blockheight": 123}, {"name": "Basilisk", "blockheight": 1234}] "hardforks": [{"name": "Aspidochelone", "blockheight": 123}, {"name": "Basilisk", "blockheight": 1234}]
}, },
"rpc": {
"maxiteratorresultitems": 100,
"sessionenabled": true
},
"tcpport": 10333, "tcpport": 10333,
"useragent": "/NEO-GO:0.98.6/", "useragent": "/NEO-GO:0.98.6/",
"wsport": 10334 "wsport": 10334
@ -60,6 +64,10 @@ func TestVersion_MarshalUnmarshalJSON(t *testing.T) {
"validatorscount": 7, "validatorscount": 7,
"hardforks": [{"name": "HF_Aspidochelone", "blockheight": 123}, {"name": "HF_Basilisk", "blockheight": 1234}] "hardforks": [{"name": "HF_Aspidochelone", "blockheight": 123}, {"name": "HF_Basilisk", "blockheight": 1234}]
}, },
"rpc": {
"maxiteratorresultitems": 100,
"sessionenabled": true
},
"tcpport": 10333, "tcpport": 10333,
"useragent": "/Neo:3.1.0/", "useragent": "/Neo:3.1.0/",
"wsport": 10334 "wsport": 10334
@ -69,6 +77,10 @@ func TestVersion_MarshalUnmarshalJSON(t *testing.T) {
WSPort: 10334, WSPort: 10334,
Nonce: 1677922561, Nonce: 1677922561,
UserAgent: "/NEO-GO:0.98.6/", UserAgent: "/NEO-GO:0.98.6/",
RPC: RPC{
MaxIteratorResultItems: 100,
SessionEnabled: true,
},
Protocol: Protocol{ Protocol: Protocol{
AddressVersion: 53, AddressVersion: 53,
Network: 860833102, Network: 860833102,

8
pkg/rpcclient/rpc_test.go
View file

File diff suppressed because one or more lines are too long

4
pkg/services/rpcsrv/server.go
View file

@ -868,6 +868,10 @@ func (s *Server) getVersion(_ params.Params) (any, *neorpc.Error) {
TCPPort: port, TCPPort: port,
Nonce: s.coreServer.ID(), Nonce: s.coreServer.ID(),
UserAgent: s.coreServer.UserAgent, UserAgent: s.coreServer.UserAgent,
RPC: result.RPC{
MaxIteratorResultItems: s.config.MaxIteratorResultItems,
SessionEnabled: s.config.SessionEnabled,
},
Protocol: result.Protocol{ Protocol: result.Protocol{
AddressVersion: address.NEO3Prefix, AddressVersion: address.NEO3Prefix,
Network: cfg.Magic, Network: cfg.Magic,