From cd21641dfcfa0245c9f8509b6882e7e17c274d1f Mon Sep 17 00:00:00 2001
From: Alex Vanin <alexey@nspcc.ru>
Date: Tue, 23 Mar 2021 17:14:28 +0300
Subject: [PATCH] [#446] innerring: Rename `server.Index` to
 `server.InnerRingIndex`

With different indexes for inner ring list and alphabet list this
is the better naming.

Signed-off-by: Alex Vanin <alexey@nspcc.ru>
---
 pkg/innerring/processors/alphabet/process_emit.go | 2 +-
 pkg/innerring/processors/alphabet/processor.go    | 2 +-
 pkg/innerring/processors/audit/processor.go       | 2 +-
 pkg/innerring/processors/audit/scheduler.go       | 2 +-
 pkg/innerring/state.go                            | 8 ++++----
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkg/innerring/processors/alphabet/process_emit.go b/pkg/innerring/processors/alphabet/process_emit.go
index aa792965..b258e0ae 100644
--- a/pkg/innerring/processors/alphabet/process_emit.go
+++ b/pkg/innerring/processors/alphabet/process_emit.go
@@ -10,7 +10,7 @@ import (
 )
 
 func (np *Processor) processEmit() {
-	index := np.irList.Index()
+	index := np.irList.InnerRingIndex()
 	if index < 0 {
 		np.log.Info("passive mode, ignore gas emission event")
 
diff --git a/pkg/innerring/processors/alphabet/processor.go b/pkg/innerring/processors/alphabet/processor.go
index d667027f..f656c1fe 100644
--- a/pkg/innerring/processors/alphabet/processor.go
+++ b/pkg/innerring/processors/alphabet/processor.go
@@ -12,7 +12,7 @@ import (
 type (
 	// Indexer is a callback interface for inner ring global state.
 	Indexer interface {
-		Index() int
+		InnerRingIndex() int
 	}
 
 	// Contracts is an interface of the storage
diff --git a/pkg/innerring/processors/audit/processor.go b/pkg/innerring/processors/audit/processor.go
index 67d37faa..8b297010 100644
--- a/pkg/innerring/processors/audit/processor.go
+++ b/pkg/innerring/processors/audit/processor.go
@@ -21,7 +21,7 @@ import (
 type (
 	// Indexer is a callback interface for inner ring global state.
 	Indexer interface {
-		Index() int
+		InnerRingIndex() int
 		InnerRingSize() int
 	}
 
diff --git a/pkg/innerring/processors/audit/scheduler.go b/pkg/innerring/processors/audit/scheduler.go
index c4aa711c..03607cf2 100644
--- a/pkg/innerring/processors/audit/scheduler.go
+++ b/pkg/innerring/processors/audit/scheduler.go
@@ -27,7 +27,7 @@ func (ap *Processor) selectContainersToAudit(epoch uint64) ([]*container.ID, err
 		return strings.Compare(containers[i].String(), containers[j].String()) < 0
 	})
 
-	ind := ap.irList.Index()
+	ind := ap.irList.InnerRingIndex()
 	irSize := ap.irList.InnerRingSize()
 
 	if ind < 0 || ind >= irSize {
diff --git a/pkg/innerring/state.go b/pkg/innerring/state.go
index fca990f2..b0722c1e 100644
--- a/pkg/innerring/state.go
+++ b/pkg/innerring/state.go
@@ -21,12 +21,12 @@ func (s *Server) SetEpochCounter(val uint64) {
 
 // IsActive is a getter for a global active flag state.
 func (s *Server) IsActive() bool {
-	return s.Index() >= 0
+	return s.InnerRingIndex() >= 0
 }
 
-// Index is a getter for a global index of node in inner ring list. Negative
+// InnerRingIndex is a getter for a global index of node in inner ring list. Negative
 // index means that node is not in the inner ring list.
-func (s *Server) Index() int {
+func (s *Server) InnerRingIndex() int {
 	index, err := s.statusIndex.InnerRingIndex()
 	if err != nil {
 		s.log.Error("can't get inner ring index", zap.String("error", err.Error()))
@@ -49,7 +49,7 @@ func (s *Server) InnerRingSize() int {
 }
 
 func (s *Server) voteForSidechainValidator(validators []keys.PublicKey) error {
-	index := s.Index()
+	index := s.InnerRingIndex()
 	if s.contracts.alphabet.indexOutOfRange(index) {
 		s.log.Info("ignore validator vote: node not in alphabet range")