correct code style

plugin/consensus/para/para.go

@@ -63,7 +63,7 @@ type client struct {
 	execAPI         api.ExecutorAPI
 	caughtUp        int32
 	commitMsgClient *commitMsgClient
-	blockSyncClient *BlockSyncClient
+	blockSyncClient *blockSyncClient
 	authAccount     string
 	privateKey      crypto.PrivKey
 	wg              sync.WaitGroup
@@ -182,12 +182,12 @@ func New(cfg *types.Consensus, sub []byte) queue.Module {
 		para.commitMsgClient.consensStartHeight = subcfg.ParaConsensStartHeight - 1
 	}
 
-	para.blockSyncClient = &BlockSyncClient{
+	para.blockSyncClient = &blockSyncClient{
 		paraClient:       para,
 		notifyChan:       make(chan bool, 1),
 		quitChan:         make(chan struct{}),
-		maxCacheCount:    DefaultMaxCacheCount,
-		maxSyncErrCount:  DefaultMaxSyncErrCount,
+		maxCacheCount:    defaultMaxCacheCount,
+		maxSyncErrCount:  defaultMaxSyncErrCount,
 		isPrintDebugInfo: false,
 	}
 	if subcfg.MaxCacheCount > 0 {
@@ -229,7 +229,7 @@ func (client *client) SetQueueClient(c queue.Client) {
 	client.wg.Add(1)
 	go client.CreateBlock()
 	client.wg.Add(1)
-	go client.blockSyncClient.SyncBlocks()
+	go client.blockSyncClient.syncBlocks()
 }
 
 func (client *client) InitBlock() {
@@ -258,7 +258,7 @@ func (client *client) InitBlock() {
 		tx := client.CreateGenesisTx()
 		newblock.Txs = tx
 		newblock.TxHash = merkle.CalcMerkleRoot(newblock.Txs)
-		err := client.blockSyncClient.CreateGenesisBlock(newblock)
+		err := client.blockSyncClient.createGenesisBlock(newblock)
 		if err != nil {
 			panic(fmt.Sprintf("para chain create genesis block,err=%s", err.Error()))
 		}

plugin/consensus/para/para_test.go

@@ -204,7 +204,7 @@ func TestAddMinerTx(t *testing.T) {
 	para.commitMsgClient = new(commitMsgClient)
 	para.commitMsgClient.paraClient = para
 
-	para.blockSyncClient = new(BlockSyncClient)
+	para.blockSyncClient = new(blockSyncClient)
 	para.blockSyncClient.paraClient = para
 	para.blockSyncClient.addMinerTx(nil, block, localBlock)
 	assert.Equal(t, 1, len(block.Txs))

plugin/consensus/para/paracommitmsg.go

@@ -314,8 +314,8 @@ func (client *commitMsgClient) isSync() bool {
 		return false
 	}
 
-	if !client.paraClient.blockSyncClient.SyncHasCaughtUp() {
-		plog.Info("para is not Sync", "syncCaughtUp", client.paraClient.blockSyncClient.SyncHasCaughtUp())
+	if !client.paraClient.blockSyncClient.syncHasCaughtUp() {
+		plog.Info("para is not Sync", "syncCaughtUp", client.paraClient.blockSyncClient.syncHasCaughtUp())
 		return false
 	}
 

plugin/consensus/para/paracreate.go

@@ -465,7 +465,7 @@ func (client *client) procLocalBlocks(mainBlocks *types.ParaTxDetails) error {
 		}
 	}
 	if notify {
-		client.blockSyncClient.NotifyLocalChange()
+		client.blockSyncClient.notifyLocalChange()
 	}
 
 	return nil

plugin/consensus/para/parasync_test.go

@@ -68,7 +68,7 @@ func createParaTestInstance(t *testing.T, q queue.Queue) *client {
 	para.privateKey = priKey
 
 	//实例化BlockSyncClient
-	para.blockSyncClient = &BlockSyncClient{
+	para.blockSyncClient = &blockSyncClient{
 		paraClient:      para,
 		notifyChan:      make(chan bool),
 		quitChan:        make(chan struct{}),
@@ -333,7 +333,7 @@ func mockMessageReply(q queue.Queue) {
 //测试创世区块写入
 func testCreateGenesisBlock(t *testing.T, para *client, testLoopCount int32) {
 	genesisBlock := makeGenesisBlockInputTestData()
-	err := para.blockSyncClient.CreateGenesisBlock(genesisBlock)
+	err := para.blockSyncClient.createGenesisBlock(genesisBlock)
 
 	switch testLoopCount {
 	case 0:
@@ -394,9 +394,9 @@ func testSyncBlocksIfNeed(t *testing.T, para *client, testLoopCount int32) {
 
 //测试SyncHasCaughtUp
 func testSyncHasCaughtUp(t *testing.T, para *client, testLoopCount int32) {
-	oldValue := para.blockSyncClient.SyncHasCaughtUp()
+	oldValue := para.blockSyncClient.syncHasCaughtUp()
 	para.blockSyncClient.setSyncCaughtUp(true)
-	isSyncHasCaughtUp := para.blockSyncClient.SyncHasCaughtUp()
+	isSyncHasCaughtUp := para.blockSyncClient.syncHasCaughtUp()
 	para.blockSyncClient.setSyncCaughtUp(oldValue)
 
 	assert.Equal(t, true, isSyncHasCaughtUp)
@@ -405,11 +405,11 @@ func testSyncHasCaughtUp(t *testing.T, para *client, testLoopCount int32) {
 //测试getBlockSyncState
 func testGetBlockSyncState(t *testing.T, para *client, testLoopCount int32) {
 	oldValue := para.blockSyncClient.getBlockSyncState()
-	para.blockSyncClient.setBlockSyncState(BlockSyncStateFinished)
+	para.blockSyncClient.setBlockSyncState(blockSyncStateFinished)
 	syncState := para.blockSyncClient.getBlockSyncState()
 	para.blockSyncClient.setBlockSyncState(oldValue)
 
-	assert.Equal(t, true, syncState == BlockSyncStateFinished)
+	assert.Equal(t, true, syncState == blockSyncStateFinished)
 }
 
 //执行所有函数测试