neorpc: change func getStorage - return errors

Function getStorage has started to return errors unlike to previous behavior: return nil instead of errors. Close nspcc-dev#2248 Signed-off-by: Tatiana Nesterenko <tatiana@nspcc.io>
tatiana-nspcc · Aug 10, 2023 · 907b120 · 907b120
1 parent e2aabe4
commit 907b120
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 10 deletions.
diff --git a/pkg/services/rpcsrv/server.go b/pkg/services/rpcsrv/server.go
@@ -1718,9 +1718,6 @@ func (s *Server) getStateRoot(ps params.Params) (any, *neorpc.Error) {
 
 func (s *Server) getStorage(ps params.Params) (any, *neorpc.Error) {
 	id, rErr := s.contractIDFromParam(ps.Value(0))
-	if rErr == neorpc.ErrVerificationFailed {
-		return nil, nil
-	}
 	if rErr != nil {
 		return nil, rErr
 	}
@@ -1732,7 +1729,7 @@ func (s *Server) getStorage(ps params.Params) (any, *neorpc.Error) {
 
 	item := s.chain.GetStorageItem(id, key)
 	if item == nil {
-		return "", nil
+		return "", neorpc.ErrUnknownStorageItem
 	}
 
 	return []byte(item), nil

diff --git a/pkg/services/rpcsrv/server_test.go b/pkg/services/rpcsrv/server_test.go
@@ -621,12 +621,10 @@ var rpcTestCases = map[string][]rpcTestCase{
 			},
 		},
 		{
-			name:   "missing key",
-			params: fmt.Sprintf(`["%s", "dGU="]`, testContractHash),
-			result: func(e *executor) any {
-				v := ""
-				return &v
-			},
+			name:    "missing key",
+			params:  fmt.Sprintf(`["%s", "dGU="]`, testContractHash),
+			fail:    true,
+			errCode: neorpc.ErrUnknownStorageItemCode,
 		},
 		{
 			name:    "no params",