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

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

Browse source 
rpc: bump getversion compat
This commit is contained in:
Roman Khimov 2022-05-16 09:52:46 +03:00 committed by GitHub
commit 519a0f3d30
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 13 additions and 13 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
// clients compatibility with newer RPC servers (https://github.com/nspcc-dev/neo-go/pull/2435).
var latestNonBreakingVersion = *semver.New("0.98.4")
var latestNonBreakingVersion = *semver.New("0.98.5")
// MarshalJSON implements the json marshaller interface.
func (v *Version) MarshalJSON() ([]byte, error) {

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

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

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)
serverConfig := network.NewServerConfig(cfg)
serverConfig.UserAgent = fmt.Sprintf(config.UserAgentFormat, "0.98.5-test")
serverConfig.UserAgent = fmt.Sprintf(config.UserAgentFormat, "0.98.6-test")
serverConfig.Port = 0
server, err := network.NewServer(serverConfig, chain, chain.GetStateSyncModule(), logger)
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{}) {
resp, ok := ver.(*result.Version)
require.True(t, ok)
require.Equal(t, "/NEO-GO:0.98.5-test/", resp.UserAgent)
require.Equal(t, "/NEO-GO:0.98.6-test/", resp.UserAgent)
cfg := e.chain.GetConfig()
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)
serverConfig := network.NewServerConfig(cfg)
serverConfig.UserAgent = fmt.Sprintf(config.UserAgentFormat, "0.98.5-test")
serverConfig.UserAgent = fmt.Sprintf(config.UserAgentFormat, "0.98.6-test")
serverConfig.LogLevel = zapcore.FatalLevel
server, err := network.NewServer(serverConfig, chain, chain.GetStateSyncModule(), logger)
require.NoError(b, err)