Merge pull request #2334 from nspcc-dev/extendable-validators

Extendable validators

pkg/rpc/server/server.go

@@ -533,7 +533,7 @@ func (s *Server) getVersion(_ request.Params) (interface{}, *response.Error) {
 			MaxValidUntilBlockIncrement: cfg.MaxValidUntilBlockIncrement,
 			MaxTransactionsPerBlock:     cfg.MaxTransactionsPerBlock,
 			MemoryPoolMaxTransactions:   cfg.MemPoolSize,
-			ValidatorsCount:             byte(cfg.ValidatorsCount),
+			ValidatorsCount:             byte(cfg.GetNumOfCNs(s.chain.BlockHeight())),
 			InitialGasDistribution:      cfg.InitialGASSupply,
 			StateRootInHeader:           cfg.StateRootInHeader,
 		},

pkg/rpc/server/server_test.go

@@ -699,8 +699,7 @@ var rpcTestCases = map[string][]rpcTestCase{
 		{
 			params: "[]",
 			result: func(e *executor) interface{} {
-				// it's a test chain, so committee is a sorted standby committee
-				expected := e.chain.GetStandByCommittee()
+				expected, _ := e.chain.GetCommittee()
 				sort.Sort(expected)
 				return &expected
 			},