ts to ms (#71)

[bytom/vapor.git] / netsync / tool_test.go

diff --git a/netsync/tool_test.go b/netsync/tool_test.go
index f021751..e817930 100644 (file)
--- a/netsync/tool_test.go
+++ b/netsync/tool_test.go
@@ -4,7 +4,6 @@ import (
        "errors"
        "math/rand"
        "net"
-       "time"
 
        wire "github.com/tendermint/go-wire"
        "github.com/tendermint/tmlibs/flowrate"
@@ -44,6 +43,10 @@ func (p *P2PPeer) ID() string {
        return p.id
 }
 
+func (p *P2PPeer) IsLAN() bool {
+       return false
+}
+
 func (p *P2PPeer) ServiceFlag() consensus.ServiceFlag {
        return p.flag
 }
@@ -114,8 +117,8 @@ func (nw *NetWork) HandsShake(nodeA, nodeB *SyncManager) (*P2PPeer, *P2PPeer, er
        A2B.SetConnection(&B2A, nodeB)
        B2A.SetConnection(&A2B, nodeA)
 
-       nodeA.handleStatusRequestMsg(&A2B)
-       nodeB.handleStatusRequestMsg(&B2A)
+       nodeA.AddPeer(&A2B)
+       nodeB.AddPeer(&B2A)
 
        A2B.setAsync(true)
        B2A.setAsync(true)
@@ -126,7 +129,7 @@ func mockBlocks(startBlock *types.Block, height uint64) []*types.Block {
        blocks := []*types.Block{}
        indexBlock := &types.Block{}
        if startBlock == nil {
-               indexBlock = &types.Block{BlockHeader: types.BlockHeader{}}
+               indexBlock = &types.Block{BlockHeader: types.BlockHeader{Version: uint64(rand.Uint32())}}
                blocks = append(blocks, indexBlock)
        } else {
                indexBlock = startBlock
@@ -137,6 +140,7 @@ func mockBlocks(startBlock *types.Block, height uint64) []*types.Block {
                        BlockHeader: types.BlockHeader{
                                Height:            indexBlock.Height + 1,
                                PreviousBlockHash: indexBlock.Hash(),
+                               Version:           uint64(rand.Uint32()),
                        },
                }
                blocks = append(blocks, block)
@@ -165,15 +169,13 @@ func mockSync(blocks []*types.Block) *SyncManager {
 func mockTxs(txCount int) ([]*types.Tx, []*bc.Tx) {
        var txs []*types.Tx
        var bcTxs []*bc.Tx
-       for i := 0; i < txCount; i++ {
-               trueProg := mockControlProgram(60)
-               assetID := bc.ComputeAssetID(trueProg, 1, &bc.EmptyStringHash)
-               now := []byte(time.Now().String())
-               issuanceInp := types.NewIssuanceInput(now, 1, trueProg, nil, nil)
+       trueProg := mockControlProgram(60)
+       assetID := bc.AssetID{V0: 9999}
+       for i := uint64(0); i < uint64(txCount); i++ {
                tx := types.NewTx(types.TxData{
                        Version: 1,
-                       Inputs:  []*types.TxInput{issuanceInp},
-                       Outputs: []*types.TxOutput{types.NewTxOutput(assetID, 1, trueProg)},
+                       Inputs:  []*types.TxInput{types.NewSpendInput(nil, bc.Hash{V0: i + 1}, assetID, i, i, trueProg)},
+                       Outputs: []*types.TxOutput{types.NewIntraChainOutput(assetID, 1, trueProg)},
                })
                txs = append(txs, tx)
                bcTxs = append(bcTxs, tx.Tx)