Fix healthcheck

Author: Jayash Satolia

code/go/0chain.net/blobbercore/handler/health.go

@@ -31,34 +31,41 @@ func getBlobberHealthCheckError() error {
 	return err
 }
 
-func BlobberHealthCheck() (*coreTxn.Transaction, error) {
+func BlobberHealthCheck() (string, error) {
 	if config.Configuration.Capacity == 0 {
 
 		setBlobberHealthCheckError(ErrBlobberHasRemoved)
-		return nil, ErrBlobberHasRemoved
+		return "", ErrBlobberHasRemoved
 	}
 
 	_, _, _, txn, err := coreTxn.SmartContractTxn(transaction.STORAGE_CONTRACT_ADDRESS, coreTxn.SmartContractTxnData{
 		Name:      transaction.BLOBBER_HEALTH_CHECK,
 		InputArgs: common.Now(),
 	}, true)
-	if err != nil {
+	if err != nil || txn == nil {
 		logging.Logger.Error("Failed to health check blobber on the blockchain",
 			zap.Error(err))
 		setBlobberHealthCheckError(err)
 
-		return nil, err
+		return "", err
 	}
 
 	setBlobberHealthCheckError(nil)
 
-	return txn, nil
+	return txn.Hash, nil
 }
 
-func ValidatorHealthCheck() (*coreTxn.Transaction, error) {
+func ValidatorHealthCheck() (string, error) {
 	_, _, _, txn, err := coreTxn.SmartContractTxn(transaction.STORAGE_CONTRACT_ADDRESS, coreTxn.SmartContractTxnData{
 		Name:      transaction.VALIDATOR_HEALTH_CHECK,
 		InputArgs: common.Now(),
 	}, true)
-	return txn, err
+
+	if err != nil || txn == nil {
+		logging.Logger.Error("Failed to health check validator on the blockchain",
+			zap.Error(err))
+		return "", err
+	}
+
+	return txn.Hash, err
 }

code/go/0chain.net/blobbercore/handler/protocol.go

@@ -152,17 +152,17 @@ var ErrValidatorNotFound = errors.New("validator is not found")
 // SendHealthCheck send heartbeat to blockchain
 func SendHealthCheck(provider common.ProviderType) (string, error) {
 
-	var txn *coreTxn.Transaction
+	var hash string
 	var err error
 
 	switch provider {
 	case common.ProviderTypeBlobber:
-		txn, err = BlobberHealthCheck()
+		hash, err = BlobberHealthCheck()
 	case common.ProviderTypeValidator:
-		txn, err = ValidatorHealthCheck()
+		hash, err = ValidatorHealthCheck()
 	default:
 		return "", errors.New("unknown provider type")
 	}
 
-	return txn.Hash, err
+	return hash, err
 }