Revert "fix: Wrong chain ID in error message when chain not found"

This reverts commit c22ab14.

packages/chains/chains.go

@@ -478,7 +478,7 @@ func (c *Chains) Get(chainID isc.ChainID) (chain.Chain, error) {
 
 	ret, exists := c.allChains.Get(chainID)
 	if !exists {
-		return nil, interfaces.NewChainNotFoundError(chainID)
+		return nil, interfaces.ErrChainNotFound
 	}
 	return ret.chain, nil
 }

packages/isc/chainid.go

@@ -45,19 +45,13 @@ func ChainIDFromBytes(data []byte) (ret ChainID, err error) {
 }
 
 func ChainIDFromString(bech32 string) (ChainID, error) {
-	netPrefix, addr, err := iotago.ParseBech32(bech32)
+	_, addr, err := iotago.ParseBech32(bech32)
 	if err != nil {
 		return ChainID{}, err
 	}
 	if addr.Type() != iotago.AddressAlias {
 		return ChainID{}, fmt.Errorf("chainID must be an alias address (%s)", bech32)
 	}
-
-	expectedNetPrefix := parameters.L1().Protocol.Bech32HRP
-	if netPrefix != expectedNetPrefix {
-		return ChainID{}, fmt.Errorf("invalid network prefix: %s", netPrefix)
-	}
-
 	return ChainIDFromAddress(addr.(*iotago.AliasAddress)), nil
 }
 

packages/webapi/controllers/chain/chain.go

@@ -65,7 +65,7 @@ func (c *Controller) getChainInfo(e echo.Context) error {
 	}
 
 	chainInfo, err := c.chainService.GetChainInfoByChainID(chainID, e.QueryParam(params.ParamBlockIndexOrTrieRoot))
-	if errors.As(err, &interfaces.ChainNotFoundError{}) {
+	if errors.Is(err, interfaces.ErrChainNotFound) {
 		return e.NoContent(http.StatusNotFound)
 	} else if err != nil {
 		return err
@@ -97,7 +97,7 @@ func (c *Controller) getChainList(e echo.Context) error {
 		chainInfo, err := c.chainService.GetChainInfoByChainID(chainID, "")
 		c.log.Infof("getchaininfo %v", err)
 
-		if errors.As(err, &interfaces.ChainNotFoundError{}) {
+		if errors.Is(err, interfaces.ErrChainNotFound) {
 			// TODO: Validate this logic here. Is it possible to still get more chain info?
 			chainList = append(chainList, models.ChainInfoResponse{
 				IsActive: false,

packages/webapi/controllers/corecontracts/controller.go

@@ -27,11 +27,9 @@ func (c *Controller) Name() string {
 }
 
 func (c *Controller) handleViewCallError(err error, chainID isc.ChainID) error {
-	var chainNotFound interfaces.ChainNotFoundError
-	if errors.As(err, &chainNotFound) {
-		return apierrors.ChainNotFoundError(chainNotFound.ChainID.String())
+	if errors.Is(err, interfaces.ErrChainNotFound) {
+		return apierrors.ChainNotFoundError(chainID.String())
 	}
-
 	return apierrors.ContractExecutionError(err)
 }
 

packages/webapi/interfaces/interfaces.go

@@ -17,6 +17,11 @@ import (
 	"github.com/iotaledger/wasp/packages/webapi/models"
 )
 
+var (
+	ErrChainNotFound      = errors.New("chain not found")
+	ErrCantDeleteLastUser = errors.New("you can't delete the last user")
+)
+
 type APIController interface {
 	Name() string
 	RegisterPublic(publicAPI echoswagger.ApiGroup, mocker Mocker)

packages/webapi/services/chain.go

@@ -163,7 +163,7 @@ func (c *ChainService) GetChainInfoByChainID(chainID isc.ChainID, blockIndexOrTr
 
 	governanceChainInfo, err := corecontracts.GetChainInfo(ch, blockIndexOrTrieRoot)
 	if err != nil {
-		if chainRecord != nil && errors.As(err, &interfaces.ChainNotFoundError{}) {
+		if chainRecord != nil && errors.Is(err, interfaces.ErrChainNotFound) {
 			return &dto.ChainInfo{ChainID: chainID, IsActive: false}, nil
 		}