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

Merge pull request #2479 from nspcc-dev/bump-getversion-version

Browse source 
rpc: bump getversion compat again
This commit is contained in:
Roman Khimov 2022-05-12 10:54:01 +03:00 committed by GitHub
commit dafd3639e8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkg/rpc/response/result/version.go
View file

@ -98,7 +98,7 @@ type (
// latestNonBreakingVersion is a latest NeoGo revision that keeps older RPC // latestNonBreakingVersion is a latest NeoGo revision that keeps older RPC
// clients compatibility with newer RPC servers (https://github.com/nspcc-dev/neo-go/pull/2435). // clients compatibility with newer RPC servers (https://github.com/nspcc-dev/neo-go/pull/2435).
var latestNonBreakingVersion = *semver.New("0.98.3") var latestNonBreakingVersion = *semver.New("0.98.4")
// MarshalJSON implements the json marshaller interface. // MarshalJSON implements the json marshaller interface.
func (v *Version) MarshalJSON() ([]byte, error) { func (v *Version) MarshalJSON() ([]byte, error) {

16
pkg/rpc/response/result/version_test.go
View file

@ -42,7 +42,7 @@ func TestVersion_MarshalUnmarshalJSON(t *testing.T) {
"validatorscount": 7 "validatorscount": 7
}, },
"tcpport": 10333, "tcpport": 10333,
"useragent": "/NEO-GO:0.98.4/", "useragent": "/NEO-GO:0.98.5/",
"wsport": 10334 "wsport": 10334
}` }`
responseFromSharp := `{ responseFromSharp := `{
@ -67,7 +67,7 @@ func TestVersion_MarshalUnmarshalJSON(t *testing.T) {
TCPPort: 10333, TCPPort: 10333,
WSPort: 10334, WSPort: 10334,
Nonce: 1677922561, Nonce: 1677922561,
UserAgent: "/NEO-GO:0.98.4/", UserAgent: "/NEO-GO:0.98.5/",
Protocol: Protocol{ Protocol: Protocol{
AddressVersion: 53, AddressVersion: 53,
Network: 860833102, Network: 860833102,
@ -123,12 +123,12 @@ func TestVersionFromUserAgent(t *testing.T) {
} }
var testcases = map[string]testCase{ var testcases = map[string]testCase{
"/Neo:3.1.0/": {success: false}, "/Neo:3.1.0/": {success: false},
"/NEO-GO:0.98.5": {success: true, cmpWithBreaking: 1}, "/NEO-GO:0.98.6": {success: true, cmpWithBreaking: 1},
"/NEO-GO:0.98.4-pre-12344/": {success: true, cmpWithBreaking: 1}, "/NEO-GO:0.98.6-pre-12344/": {success: true, cmpWithBreaking: 1},
"/NEO-GO:0.98.4/": {success: true, cmpWithBreaking: 1}, "/NEO-GO:0.98.5/": {success: true, cmpWithBreaking: 1},
"/NEO-GO:0.98.4-pre-123/": {success: true, cmpWithBreaking: 1}, "/NEO-GO:0.98.5-pre-123/": {success: true, cmpWithBreaking: 1},
"/NEO-GO:0.98.3/": {success: true, cmpWithBreaking: 0}, "/NEO-GO:0.98.4/": {success: true, cmpWithBreaking: 0},
"/NEO-GO:0.98.3-pre-12345/": {success: true, cmpWithBreaking: -1}, "/NEO-GO:0.98.4-pre-12345/": {success: true, cmpWithBreaking: -1},
"/NEO-GO:123456": {success: false}, "/NEO-GO:123456": {success: false},
} }
for str, tc := range testcases { for str, tc := range testcases {

2
pkg/rpc/server/server_helper_test.go
View file

@ -102,7 +102,7 @@ func initClearServerWithServices(t testing.TB, needOracle bool, needNotary bool)
chain, orc, cfg, logger := getUnitTestChain(t, needOracle, needNotary) chain, orc, cfg, logger := getUnitTestChain(t, needOracle, needNotary)
serverConfig := network.NewServerConfig(cfg) serverConfig := network.NewServerConfig(cfg)
serverConfig.UserAgent = fmt.Sprintf(config.UserAgentFormat, "0.98.4-test") serverConfig.UserAgent = fmt.Sprintf(config.UserAgentFormat, "0.98.5-test")
serverConfig.Port = 0 serverConfig.Port = 0
server, err := network.NewServer(serverConfig, chain, chain.GetStateSyncModule(), logger) server, err := network.NewServer(serverConfig, chain, chain.GetStateSyncModule(), logger)
require.NoError(t, err) require.NoError(t, err)

4
pkg/rpc/server/server_test.go
View file

@ -851,7 +851,7 @@ var rpcTestCases = map[string][]rpcTestCase{
check: func(t *testing.T, e *executor, ver interface{}) { check: func(t *testing.T, e *executor, ver interface{}) {
resp, ok := ver.(*result.Version) resp, ok := ver.(*result.Version)
require.True(t, ok) require.True(t, ok)
require.Equal(t, "/NEO-GO:0.98.4-test/", resp.UserAgent) require.Equal(t, "/NEO-GO:0.98.5-test/", resp.UserAgent)
cfg := e.chain.GetConfig() cfg := e.chain.GetConfig()
require.EqualValues(t, address.NEO3Prefix, resp.Protocol.AddressVersion) require.EqualValues(t, address.NEO3Prefix, resp.Protocol.AddressVersion)
@ -2984,7 +2984,7 @@ func BenchmarkHandleIn(b *testing.B) {
chain, orc, cfg, logger := getUnitTestChain(b, false, false) chain, orc, cfg, logger := getUnitTestChain(b, false, false)
serverConfig := network.NewServerConfig(cfg) serverConfig := network.NewServerConfig(cfg)
serverConfig.UserAgent = fmt.Sprintf(config.UserAgentFormat, "0.98.4-test") serverConfig.UserAgent = fmt.Sprintf(config.UserAgentFormat, "0.98.5-test")
serverConfig.LogLevel = zapcore.FatalLevel serverConfig.LogLevel = zapcore.FatalLevel
server, err := network.NewServer(serverConfig, chain, chain.GetStateSyncModule(), logger) server, err := network.NewServer(serverConfig, chain, chain.GetStateSyncModule(), logger)
require.NoError(b, err) require.NoError(b, err)