improving error handling

rubixchain · Aug 5, 2024 · 2ef7db3 · 2ef7db3
1 parent 4262d5c
commit 2ef7db3
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/core/smartcontract_tokenchain_validation.go b/core/smartcontract_tokenchain_validation.go
@@ -16,8 +16,8 @@ func (c *Core) SmartContractTokenChainValidation(user_did string, tokenId string
 	}
 	ok := c.w.IsDIDExist(user_did)
 	if !ok {
-		response.Message = "Invalid did"
-		return response, fmt.Errorf("invalid did: %v", user_did)
+		response.Message = "Invalid did, please pass did of the tokenchain validator"
+		return response, fmt.Errorf("invalid did: %v, please pass did of the tokenchain validator", user_did)
 	}
 
 	if tokenId == "" { //if provided the boolean flag 'allmyToken', all the tokens' chain from tokens table will be validated

diff --git a/core/token_chain_validation.go b/core/token_chain_validation.go
@@ -19,8 +19,8 @@ func (c *Core) TokenChainValidation(user_did string, tokenId string, blockCount
 	}
 	ok := c.w.IsDIDExist(user_did)
 	if !ok {
-		response.Message = "Invalid did"
-		return response, fmt.Errorf("invalid did: %v", user_did)
+		response.Message = "Invalid did, please pass did of the tokenchain validator"
+		return response, fmt.Errorf("invalid did: %v, please pass did of the tokenchain validator", user_did)
 	}
 
 	if tokenId == "" { //if provided the boolean flag 'allmyToken', all the tokens' chain from tokens table will be validated

diff --git a/server/tokens.go b/server/tokens.go
@@ -330,13 +330,13 @@ func (s *Server) APIValidateTokenChain(req *ensweb.Request) *ensweb.Result {
 		s.log.Debug("validating smart contract")
 		br, err = s.c.SmartContractTokenChainValidation(user_did, token, blockCount)
 		if err != nil {
-			return s.BasicResponse(req, false, "Failed to validate token(s)", nil)
+			return s.BasicResponse(req, false, br.Message, nil)
 		}
 	} else {
 		s.log.Debug("validating rbt token")
 		br, err = s.c.TokenChainValidation(user_did, token, blockCount)
 		if err != nil {
-			return s.BasicResponse(req, false, "Failed to validate token(s)", nil)
+			return s.BasicResponse(req, false, br.Message, nil)
 		}
 	}