From 6cab1635d4cc03362477c664c5d70cd523404127 Mon Sep 17 00:00:00 2001
From: Pavel Karpy <carpawell@nspcc.ru>
Date: Wed, 20 Oct 2021 16:21:40 +0300
Subject: [PATCH] [#936] ir: Do not require number of Alphabet contracts to be
 set

Signed-off-by: Pavel Karpy <carpawell@nspcc.ru>
---
 cmd/neofs-ir/defaults.go   |  2 --
 pkg/innerring/contracts.go | 17 +++++++++++++++++
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/cmd/neofs-ir/defaults.go b/cmd/neofs-ir/defaults.go
index f31354fa..516192ba 100644
--- a/cmd/neofs-ir/defaults.go
+++ b/cmd/neofs-ir/defaults.go
@@ -64,8 +64,6 @@ func defaultConfiguration(cfg *viper.Viper) {
 	cfg.SetDefault("contracts.proxy", "")
 	cfg.SetDefault("contracts.processing", "")
 	cfg.SetDefault("contracts.reputation", "")
-	// alphabet contracts
-	cfg.SetDefault("contracts.alphabet.amount", 7)
 
 	cfg.SetDefault("timers.epoch", "0")
 	cfg.SetDefault("timers.emit", "0")
diff --git a/pkg/innerring/contracts.go b/pkg/innerring/contracts.go
index dcc59ed7..5c5504f2 100644
--- a/pkg/innerring/contracts.go
+++ b/pkg/innerring/contracts.go
@@ -1,6 +1,7 @@
 package innerring
 
 import (
+	"errors"
 	"fmt"
 	"strings"
 
@@ -87,18 +88,34 @@ func parseAlphabetContracts(cfg *viper.Viper, morph *client.Client) (alphabetCon
 		return nil, fmt.Errorf("amount of alphabet contracts overflows glagolitsa %d > %d", num, lastLetterNum)
 	}
 
+	thresholdIsSet := num != 0
+
+	if !thresholdIsSet {
+		// try to read maximum alphabet contracts
+		// if threshold has not been set manually
+		num = lastLetterNum
+	}
+
 	for letter := az; letter < num; letter++ {
 		contractHash, err := parseContract(cfg, morph,
 			"contracts.alphabet."+letter.String(),
 			client.NNSAlphabetContractName(int(letter)),
 		)
 		if err != nil {
+			if errors.Is(err, client.ErrNNSRecordNotFound) {
+				break
+			}
+
 			return nil, fmt.Errorf("invalid alphabet %s contract: %w", letter, err)
 		}
 
 		alpha.set(letter, contractHash)
 	}
 
+	if thresholdIsSet && len(alpha) != int(num) {
+		return nil, fmt.Errorf("could not read all contracts: required %d, read %d", num, len(alpha))
+	}
+
 	return alpha, nil
 }