cerc-io/lotus
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 27 Wiki Activity

Merge pull request #120 from filecoin-project/fix/sync-tests-build

Browse Source 
Fix chain sync tests merge fail
This commit is contained in:
Whyrusleeping 2019-08-05 15:01:26 -07:00 committed by GitHub
commit abe1edb147
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
chain/gen/gen.go
View File

@ -170,10 +170,10 @@ func (cg *ChainGen) nextBlockProof() (address.Address, types.ElectionProof, []ty
return cg.miner, []byte("cat in a box"), []types.Ticket{types.Ticket("im a ticket, promise")}, nil return cg.miner, []byte("cat in a box"), []types.Ticket{types.Ticket("im a ticket, promise")}, nil
} }
func (cg *ChainGen) NextBlock() (*types.FullBlock, error) { func (cg *ChainGen) NextBlock() (*types.FullBlock, []*types.SignedMessage, error) {
miner, proof, tickets, err := cg.nextBlockProof() miner, proof, tickets, err := cg.nextBlockProof()
if err != nil { if err != nil {
return nil, err return nil, nil, err
} }
// make some transfers from banker // make some transfers from banker
@ -196,12 +196,12 @@ func (cg *ChainGen) NextBlock() (*types.FullBlock, error) {
unsigned, err := msg.Serialize() unsigned, err := msg.Serialize()
if err != nil { if err != nil {
return nil, err return nil, nil, err
} }
sig, err := cg.w.Sign(cg.banker, unsigned) sig, err := cg.w.Sign(cg.banker, unsigned)
if err != nil { if err != nil {
return &types.FullBlock{}, err return nil, nil, err
} }
msgs[m] = &types.SignedMessage{ msgs[m] = &types.SignedMessage{
@ -210,7 +210,7 @@ func (cg *ChainGen) NextBlock() (*types.FullBlock, error) {
} }
if _, err := cg.cs.PutMessage(msgs[m]); err != nil { if _, err := cg.cs.PutMessage(msgs[m]); err != nil {
return nil, err return nil, nil, err
} }
} }
@ -218,21 +218,21 @@ func (cg *ChainGen) NextBlock() (*types.FullBlock, error) {
parents, err := types.NewTipSet([]*types.BlockHeader{cg.curBlock.Header}) parents, err := types.NewTipSet([]*types.BlockHeader{cg.curBlock.Header})
if err != nil { if err != nil {
return nil, err return nil, nil, err
} }
fblk, err := MinerCreateBlock(context.TODO(), cg.cs, miner, parents, tickets, proof, msgs) fblk, err := MinerCreateBlock(context.TODO(), cg.cs, miner, parents, tickets, proof, msgs)
if err != nil { if err != nil {
return nil, err return nil, nil, err
} }
if err := cg.cs.AddBlock(fblk.Header); err != nil { if err := cg.cs.AddBlock(fblk.Header); err != nil {
return nil, err return nil, nil, err
} }
cg.curBlock = fblk cg.curBlock = fblk
return fblk, nil return fblk, msgs, nil
} }
func (cg *ChainGen) YieldRepo() (repo.Repo, error) { func (cg *ChainGen) YieldRepo() (repo.Repo, error) {

2
chain/gen/gen_test.go
View File

@ -11,7 +11,7 @@ func testGeneration(t testing.TB, n int) {
} }
for i := 0; i < n; i++ { for i := 0; i < n; i++ {
b, err := g.NextBlock() b, _, err := g.NextBlock()
if err != nil { if err != nil {
t.Fatalf("error at H:%d, %s", i, err) t.Fatalf("error at H:%d, %s", i, err)
} }

13
chain/sync_test.go
View File

@ -27,7 +27,7 @@ func (tu *syncTestUtil) repoWithChain(t *testing.T, h int) (repo.Repo, []byte, [
for i := 0; i < h; i++ { for i := 0; i < h; i++ {
var err error var err error
blks[i], err = tu.g.NextBlock() blks[i], _, err = tu.g.NextBlock()
require.NoError(t, err) require.NoError(t, err)
fmt.Printf("block at H:%d: %s\n", blks[i].Header.Height, blks[i].Cid()) fmt.Printf("block at H:%d: %s\n", blks[i].Header.Height, blks[i].Cid())
@ -84,10 +84,10 @@ func prepSyncTest(t *testing.T, h int) *syncTestUtil {
} }
func (tu *syncTestUtil) mineNewBlock(src int) { func (tu *syncTestUtil) mineNewBlock(src int) {
fblk, err := tu.g.NextBlock() fblk, msgs, err := tu.g.NextBlock()
require.NoError(tu.t, err) require.NoError(tu.t, err)
for _, msg := range fblk.Messages { for _, msg := range msgs {
require.NoError(tu.t, tu.nds[src].MpoolPush(context.TODO(), msg)) require.NoError(tu.t, tu.nds[src].MpoolPush(context.TODO(), msg))
} }
@ -99,8 +99,11 @@ func fblkToBlkMsg(fb *types.FullBlock) *chain.BlockMsg {
Header: fb.Header, Header: fb.Header,
} }
for _, msg := range fb.Messages { for _, msg := range fb.BlsMessages {
out.Messages = append(out.Messages, msg.Cid()) out.BlsMessages = append(out.BlsMessages, msg.Cid())
}
for _, msg := range fb.SecpkMessages {
out.SecpkMessages = append(out.SecpkMessages, msg.Cid())
} }
return out return out
} }