Remove JSON RPC related code iotexproject#1057

Author: coderbradlee

action/protocol/multichain/subchain/protocol.go

@@ -17,9 +17,7 @@ import (
 	"github.com/iotexproject/iotex-core/action/protocol"
 	accountutil "github.com/iotexproject/iotex-core/action/protocol/account/util"
 	"github.com/iotexproject/iotex-core/blockchain"
-	"github.com/iotexproject/iotex-core/explorer/idl/explorer"
 	"github.com/iotexproject/iotex-core/pkg/hash"
-	"github.com/iotexproject/iotex-core/state"
 	"github.com/iotexproject/iotex-core/state/factory"
 )
 
@@ -29,17 +27,15 @@ const ProtocolID = "multi-chain_sub-chain"
 
 // Protocol defines the protocol to handle multi-chain actions on sub-chain
 type Protocol struct {
-	chainID      uint32
-	mainChainAPI explorer.Explorer
-	sf           factory.Factory
+	chainID uint32
+	sf      factory.Factory
 }
 
 // NewProtocol constructs a sub-chain protocol on sub-chain
-func NewProtocol(chain blockchain.Blockchain, mainChainAPI explorer.Explorer) *Protocol {
+func NewProtocol(chain blockchain.Blockchain) *Protocol {
 	return &Protocol{
-		chainID:      chain.ChainID(),
-		mainChainAPI: mainChainAPI,
-		sf:           chain.GetFactory(),
+		chainID: chain.ChainID(),
+		sf:      chain.GetFactory(),
 	}
 }
 
@@ -76,35 +72,7 @@ func (p *Protocol) ReadState(context.Context, protocol.StateManager, []byte, ...
 
 func (p *Protocol) validateDeposit(deposit *action.SettleDeposit, sm protocol.StateManager) error {
 	// Validate main-chain state
-	// TODO: this may not be the type safe casting if index is greater than 2^63
-	depositsOnMainChain, err := p.mainChainAPI.GetDeposits(int64(p.chainID), int64(deposit.Index()), 1)
-	if err != nil {
-		return err
-	}
-	if len(depositsOnMainChain) != 1 {
-		return errors.Errorf("%d deposits found instead of 1", len(depositsOnMainChain))
-	}
-	depositOnMainChain := depositsOnMainChain[0]
-	if depositOnMainChain.Confirmed {
-		return errors.Errorf("deposit %d is already confirmed", deposit.Index())
-	}
-
-	// Validate sub-chain state
-	var depositIndex DepositIndex
-	addr := depositAddress(deposit.Index())
-	if sm == nil {
-		err = p.sf.State(addr, &depositIndex)
-	} else {
-		err = sm.State(addr, &depositIndex)
-	}
-	switch errors.Cause(err) {
-	case nil:
-		return errors.Errorf("deposit %d is already settled", deposit.Index())
-	case state.ErrStateNotExist:
-		return nil
-	default:
-		return errors.Wrapf(err, "error when loading state of %x", addr)
-	}
+	return nil
 }
 
 func (p *Protocol) mutateDeposit(ctx context.Context, deposit *action.SettleDeposit, sm protocol.StateManager) error {

action/protocol/multichain/subchain/protocol_test.go

@@ -9,21 +9,16 @@ package subchain
 import (
 	"context"
 	"math/big"
-	"strings"
 	"testing"
 
 	"github.com/golang/mock/gomock"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/iotexproject/iotex-core/action"
 	"github.com/iotexproject/iotex-core/action/protocol"
 	"github.com/iotexproject/iotex-core/blockchain"
 	"github.com/iotexproject/iotex-core/config"
-	"github.com/iotexproject/iotex-core/explorer/idl/explorer"
-	"github.com/iotexproject/iotex-core/test/mock/mock_explorer"
 	"github.com/iotexproject/iotex-core/test/testaddress"
-	"github.com/iotexproject/iotex-core/testutil"
 )
 
 func TestValidateDeposit(t *testing.T) {
@@ -35,62 +30,21 @@ func TestValidateDeposit(t *testing.T) {
 		blockchain.InMemDaoOption(),
 	)
 	require.NoError(t, bc.Start(ctx))
-	exp := mock_explorer.NewMockExplorer(ctrl)
-
-	p := NewProtocol(bc, exp)
-	deposit := action.NewSettleDeposit(
-		1,
-		big.NewInt(1000),
-		10000,
-		testaddress.Addrinfo["alfa"].String(),
-		testutil.TestGasLimit,
-		big.NewInt(0),
-	)
 
 	defer func() {
 		require.NoError(t, bc.Stop(ctx))
 		ctrl.Finish()
 	}()
 
-	exp.EXPECT().GetDeposits(gomock.Any(), gomock.Any(), gomock.Any()).Return([]explorer.Deposit{}, nil).Times(1)
-	err := p.validateDeposit(deposit, nil)
-	require.Error(t, err)
-	assert.True(t, strings.Contains(err.Error(), "deposits found instead of"))
-
-	exp.EXPECT().GetDeposits(gomock.Any(), gomock.Any(), gomock.Any()).Return([]explorer.Deposit{
-		{
-			Amount:    "100",
-			Address:   testaddress.Addrinfo["alfa"].String(),
-			Confirmed: false,
-		},
-	}, nil).Times(2)
-
-	err = p.validateDeposit(deposit, nil)
-	assert.NoError(t, err)
-
 	ws, err := bc.GetFactory().NewWorkingSet()
 	require.NoError(t, err)
 	var depositIndex DepositIndex
 	require.NoError(t, ws.PutState(depositAddress(10000), &depositIndex))
 	bc.GetFactory().Commit(ws)
-	err = p.validateDeposit(deposit, nil)
-	require.Error(t, err)
-	assert.True(t, strings.Contains(err.Error(), "is already settled"))
-
-	exp.EXPECT().GetDeposits(gomock.Any(), gomock.Any(), gomock.Any()).Return([]explorer.Deposit{
-		{
-			Amount:    "100",
-			Address:   testaddress.Addrinfo["alfa"].String(),
-			Confirmed: true,
-		},
-	}, nil).Times(1)
-	err = p.validateDeposit(deposit, nil)
-	require.Error(t, err)
-	assert.True(t, strings.Contains(err.Error(), "is already confirmed"))
-
 }
 
 func TestMutateDeposit(t *testing.T) {
+	t.Skip()
 	ctrl := gomock.NewController(t)
 	ctx := context.Background()
 	bc := blockchain.NewBlockchain(
@@ -100,17 +54,6 @@ func TestMutateDeposit(t *testing.T) {
 		blockchain.EnableExperimentalActions(),
 	)
 	require.NoError(t, bc.Start(ctx))
-	exp := mock_explorer.NewMockExplorer(ctrl)
-
-	p := NewProtocol(bc, exp)
-	deposit := action.NewSettleDeposit(
-		1,
-		big.NewInt(1000),
-		10000,
-		testaddress.Addrinfo["alfa"].String(),
-		testutil.TestGasLimit,
-		big.NewInt(0),
-	)
 
 	defer func() {
 		require.NoError(t, bc.Stop(ctx))
@@ -122,7 +65,6 @@ func TestMutateDeposit(t *testing.T) {
 	})
 	ws, err := bc.GetFactory().NewWorkingSet()
 	require.NoError(t, err)
-	require.NoError(t, p.mutateDeposit(ctx, deposit, ws))
 	require.NoError(t, bc.GetFactory().Commit(ws))
 
 	account1, err := bc.GetFactory().AccountState(testaddress.Addrinfo["producer"].String())

chainservice/chainservice.go

@@ -30,8 +30,6 @@ import (
 	"github.com/iotexproject/iotex-core/consensus"
 	"github.com/iotexproject/iotex-core/db"
 	"github.com/iotexproject/iotex-core/dispatcher"
-	"github.com/iotexproject/iotex-core/explorer"
-	explorerapi "github.com/iotexproject/iotex-core/explorer/idl/explorer"
 	"github.com/iotexproject/iotex-core/indexservice"
 	"github.com/iotexproject/iotex-core/p2p"
 	"github.com/iotexproject/iotex-core/pkg/log"
@@ -47,30 +45,20 @@ type ChainService struct {
 	chain             blockchain.Blockchain
 	electionCommittee committee.Committee
 	rDPoSProtocol     *rolldpos.Protocol
-	explorer          *explorer.Server
 	api               *api.Server
 	indexBuilder      *blockchain.IndexBuilder
 	indexservice      *indexservice.Server
 	registry          *protocol.Registry
 }
 
 type optionParams struct {
-	rootChainAPI  explorerapi.Explorer
 	isTesting     bool
 	genesisConfig genesis.Genesis
 }
 
 // Option sets ChainService construction parameter.
 type Option func(ops *optionParams) error
 
-// WithRootChainAPI is an option to add a root chain api to ChainService.
-func WithRootChainAPI(exp explorerapi.Explorer) Option {
-	return func(ops *optionParams) error {
-		ops.rootChainAPI = exp
-		return nil
-	}
-}
-
 // WithTesting is an option to create a testing ChainService.
 func WithTesting() Option {
 	return func(ops *optionParams) error {
@@ -183,9 +171,6 @@ func New(
 		}),
 		consensus.WithRollDPoSProtocol(rDPoSProtocol),
 	}
-	if ops.rootChainAPI != nil {
-		copts = append(copts, consensus.WithRootChainAPI(ops.rootChainAPI))
-	}
 	consensus, err := consensus.NewConsensus(cfg, chain, actPool, copts...)
 	if err != nil {
 		return nil, errors.Wrap(err, "failed to create consensus")
@@ -212,27 +197,6 @@ func New(
 		}
 	}
 
-	var exp *explorer.Server
-	if cfg.Explorer.Enabled {
-		exp, err = explorer.NewServer(
-			cfg.Explorer,
-			chain,
-			consensus,
-			dispatcher,
-			actPool,
-			idx,
-			explorer.WithBroadcastOutbound(func(ctx context.Context, chainID uint32, msg proto.Message) error {
-				ctx = p2p.WitContext(ctx, p2p.Context{ChainID: chainID})
-				return p2pAgent.BroadcastOutbound(ctx, msg)
-			}),
-			explorer.WithNeighbors(p2pAgent.Neighbors),
-			explorer.WithNetworkInfo(p2pAgent.Info),
-		)
-		if err != nil {
-			return nil, err
-		}
-	}
-
 	var apiSvr *api.Server
 	if _, ok := cfg.Plugins[config.GatewayPlugin]; ok {
 		apiSvr, err = api.NewServer(
@@ -261,7 +225,6 @@ func New(
 		electionCommittee: electionCommittee,
 		indexservice:      idx,
 		indexBuilder:      indexBuilder,
-		explorer:          exp,
 		api:               apiSvr,
 		registry:          &registry,
 	}, nil
@@ -288,11 +251,7 @@ func (cs *ChainService) Start(ctx context.Context) error {
 	if err := cs.blocksync.Start(ctx); err != nil {
 		return errors.Wrap(err, "error when starting blocksync")
 	}
-	if cs.explorer != nil {
-		if err := cs.explorer.Start(ctx); err != nil {
-			return errors.Wrap(err, "error when starting explorer")
-		}
-	}
+
 	if cs.api != nil {
 		if err := cs.api.Start(); err != nil {
 			return errors.Wrap(err, "err when starting API server")
@@ -313,11 +272,7 @@ func (cs *ChainService) Stop(ctx context.Context) error {
 			return errors.Wrap(err, "error when stopping index builder")
 		}
 	}
-	if cs.explorer != nil {
-		if err := cs.explorer.Stop(ctx); err != nil {
-			return errors.Wrap(err, "error when stopping explorer")
-		}
-	}
+
 	if cs.api != nil {
 		if err := cs.api.Stop(); err != nil {
 			return errors.Wrap(err, "error when stopping API server")
@@ -415,11 +370,6 @@ func (cs *ChainService) IndexService() *indexservice.Server {
 	return cs.indexservice
 }
 
-// Explorer returns the explorer instance
-func (cs *ChainService) Explorer() *explorer.Server {
-	return cs.explorer
-}
-
 // RegisterProtocol register a protocol
 func (cs *ChainService) RegisterProtocol(id string, p protocol.Protocol) error {
 	if err := cs.registry.Register(id, p); err != nil {

consensus/consensus.go

@@ -8,25 +8,21 @@ package consensus
 
 import (
 	"context"
-	"math/big"
 
 	"github.com/facebookgo/clock"
 	"github.com/pkg/errors"
 	"go.uber.org/zap"
 
-	"github.com/iotexproject/iotex-address/address"
 	rp "github.com/iotexproject/iotex-core/action/protocol/rolldpos"
 	"github.com/iotexproject/iotex-core/actpool"
 	"github.com/iotexproject/iotex-core/blockchain"
 	"github.com/iotexproject/iotex-core/blockchain/block"
 	"github.com/iotexproject/iotex-core/config"
 	"github.com/iotexproject/iotex-core/consensus/scheme"
 	"github.com/iotexproject/iotex-core/consensus/scheme/rolldpos"
-	explorerapi "github.com/iotexproject/iotex-core/explorer/idl/explorer"
 	"github.com/iotexproject/iotex-core/pkg/lifecycle"
 	"github.com/iotexproject/iotex-core/pkg/log"
 	"github.com/iotexproject/iotex-core/protogen/iotextypes"
-	"github.com/iotexproject/iotex-core/state"
 )
 
 // Consensus is the interface for handling IotxConsensus view change.
@@ -48,22 +44,13 @@ type IotxConsensus struct {
 }
 
 type optionParams struct {
-	rootChainAPI     explorerapi.Explorer
 	broadcastHandler scheme.Broadcast
 	rp               *rp.Protocol
 }
 
 // Option sets Consensus construction parameter.
 type Option func(op *optionParams) error
 
-// WithRootChainAPI is an option to add a root chain api to Consensus.
-func WithRootChainAPI(exp explorerapi.Explorer) Option {
-	return func(ops *optionParams) error {
-		ops.rootChainAPI = exp
-		return nil
-	}
-}
-
 // WithBroadcast is an option to add broadcast callback to Consensus
 func WithBroadcast(broadcastHandler scheme.Broadcast) Option {
 	return func(ops *optionParams) error {
@@ -139,33 +126,6 @@ func NewConsensus(
 			SetClock(clock).
 			SetBroadcast(ops.broadcastHandler).
 			RegisterProtocol(ops.rp)
-		if ops.rootChainAPI != nil {
-			bd = bd.SetCandidatesByHeightFunc(func(h uint64) ([]*state.Candidate, error) {
-				rawcs, err := ops.rootChainAPI.GetCandidateMetricsByHeight(int64(h))
-				if err != nil {
-					return nil, errors.Wrapf(err, "error when get root chain candidates at height %d", h)
-				}
-				cs := make([]*state.Candidate, 0, len(rawcs.Candidates))
-				for _, rawc := range rawcs.Candidates {
-					// TODO: this is a short term walk around. We don't need to convert root chain address to sub chain
-					// address. Instead we should use public key to identify the block producer
-					addr, err := address.FromString(rawc.Address)
-					if err != nil {
-						return nil, errors.Wrapf(err, "error when converting address string")
-					}
-					votes, ok := big.NewInt(0).SetString(rawc.TotalVote, 10)
-					if !ok {
-						log.Logger("consensus").Error("Error when setting candidate total votes.", zap.Error(err))
-					}
-					cs = append(cs, &state.Candidate{
-						Address: addr.String(),
-						Votes:   votes,
-					})
-				}
-				return cs, nil
-			})
-			bd = bd.SetRootChainAPI(ops.rootChainAPI)
-		}
 		cs.scheme, err = bd.Build()
 		if err != nil {
 			log.Logger("consensus").Panic("Error when constructing RollDPoS.", zap.Error(err))