From a188d20fd195c66289af22e7fdcc62806c65c27d Mon Sep 17 00:00:00 2001 From: Roman Khimov Date: Thu, 22 Jul 2021 19:55:41 +0300 Subject: [PATCH] rpc: fix getstateheight result compatibility C#: "result" : { "localrootindex" : 11623, "validatedrootindex" : 11623 } Go: "result" : { "blockHeight" : 11627, "stateHeight" : 11627 } --- pkg/rpc/response/result/mpt.go | 4 ++-- pkg/rpc/server/server.go | 4 ++-- pkg/rpc/server/server_test.go | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkg/rpc/response/result/mpt.go b/pkg/rpc/response/result/mpt.go index 768c382fd..8ba54defb 100644 --- a/pkg/rpc/response/result/mpt.go +++ b/pkg/rpc/response/result/mpt.go @@ -10,8 +10,8 @@ import ( // StateHeight is a result of getstateheight RPC. type StateHeight struct { - BlockHeight uint32 `json:"blockHeight"` - StateHeight uint32 `json:"stateHeight"` + Local uint32 `json:"localrootindex"` + Validated uint32 `json:"validatedrootindex"` } // ProofWithKey represens key-proof pair. diff --git a/pkg/rpc/server/server.go b/pkg/rpc/server/server.go index aef2e0946..2dd03bc8b 100644 --- a/pkg/rpc/server/server.go +++ b/pkg/rpc/server/server.go @@ -969,8 +969,8 @@ func (s *Server) getStateHeight(_ request.Params) (interface{}, *response.Error) stateHeight = height - 1 } return &result.StateHeight{ - BlockHeight: height, - StateHeight: stateHeight, + Local: height, + Validated: stateHeight, }, nil } diff --git a/pkg/rpc/server/server_test.go b/pkg/rpc/server/server_test.go index 30dda685c..c7f11b944 100644 --- a/pkg/rpc/server/server_test.go +++ b/pkg/rpc/server/server_test.go @@ -324,8 +324,8 @@ var rpcTestCases = map[string][]rpcTestCase{ sh, ok := res.(*result.StateHeight) require.True(t, ok) - require.Equal(t, e.chain.BlockHeight(), sh.BlockHeight) - require.Equal(t, uint32(0), sh.StateHeight) + require.Equal(t, e.chain.BlockHeight(), sh.Local) + require.Equal(t, uint32(0), sh.Validated) }, }, },