fix error casting

common/blocker/blocker.go

@@ -16,8 +16,6 @@ type (
 )
 
 var (
-	ServiceErr                TypeBlocker = "ServiceErr"
-	InternalErr               TypeBlocker = "InternalErr"
 	DBErr                     TypeBlocker = "DBErr"
 	DBRowNotFound             TypeBlocker = "DBRowNotFound"
 	BlockErr                  TypeBlocker = "BlockErr"
@@ -33,6 +31,7 @@ var (
 	SmithingErr               TypeBlocker = "SmithingErr"
 	ZeroParticipationScoreErr TypeBlocker = "ZeroParticipationScoreErr"
 	ChainValidationErr        TypeBlocker = "ChainValidationErr"
+	P2PPeerError              TypeBlocker = "P2PPeerError"
 	P2PNetworkConnectionErr   TypeBlocker = "P2PNetworkConnectionErr"
 	SmithingPending           TypeBlocker = "SmithingPending"
 	TimeoutExceeded           TypeBlocker = "TimeoutExceeded"

core/blockchainsync/blockchainSync.go

@@ -117,10 +117,13 @@ func (bss *BlockchainSyncService) getMoreBlocks() {
 		if err != nil {
 			monitoring.IncrementMainchainDownloadCycleDebugger(bss.ChainType, 3)
 			needDownloadBlock = false
-			errCasted := err.(blocker.Blocker)
+			errCasted, ok := err.(blocker.Blocker)
+			if !ok {
+				errCasted = blocker.NewBlocker(blocker.P2PNetworkConnectionErr, err.Error()).(blocker.Blocker)
+			}
 			monitoring.IncrementMainchainDownloadCycleDebugger(bss.ChainType, 4)
 			switch errCasted.Type {
-			case blocker.P2PNetworkConnectionErr:
+			case blocker.P2PPeerError:
 				// this will allow the node to start smithing if it fails to connect to the p2p network,
 				// eg. he is the first node. if later on he can connect, it will try resolve the fork normally
 				monitoring.IncrementMainchainDownloadCycleDebugger(bss.ChainType, 5)

core/blockchainsync/downloadBlockchain.go

@@ -93,7 +93,7 @@ func (bd *BlockchainDownloader) GetPeerBlockchainInfo() (*PeerBlockchainInfo, er
 	bd.PeerHasMore = true
 	peer := bd.PeerExplorer.GetAnyResolvedPeer()
 	if peer == nil {
-		return nil, blocker.NewBlocker(blocker.P2PNetworkConnectionErr, "no connected peer can be found")
+		return nil, blocker.NewBlocker(blocker.P2PPeerError, "no connected peer can be found")
 	}
 	peerCumulativeDifficultyResponse, err = bd.PeerServiceClient.GetCumulativeDifficulty(peer, bd.ChainType)
 	monitoring.IncrementMainchainDownloadCycleDebugger(bd.ChainType, 31)

p2p/p2p.go

@@ -290,7 +290,7 @@ func (s *Peer2PeerService) DownloadFilesFromPeer(fileChunksNames []string, maxRe
 	)
 	// Retry downloading from different peers until all chunks are downloaded or retry limit is reached
 	if len(resolvedPeers) < 1 {
-		return nil, blocker.NewBlocker(blocker.P2PNetworkConnectionErr, "no resolved peer can be found")
+		return nil, blocker.NewBlocker(blocker.P2PPeerError, "no resolved peer can be found")
 	}
 	// convert the slice to a map to make it easier to find elements in it
 	fileChunkNamesMap := make(map[string]string)