Commit 9d084661 authored by mdj33's avatar mdj33 Committed by vipwzw

fix nginx

parent ae1c33c3
...@@ -272,7 +272,44 @@ func TestGetConsensusStatus(t *testing.T) { ...@@ -272,7 +272,44 @@ func TestGetConsensusStatus(t *testing.T) {
assert.Nil(t, err) assert.Nil(t, err)
assert.Equal(t, int64(1), ret.Height) assert.Equal(t, int64(1), ret.Height)
}
mainParaSelfConsensusForkHeight = 1 //框架增加了SetAPI接口
//func TestGetConsensusStatus(t *testing.T) {
// api := new(apimock.QueueProtocolAPI)
// baseCli := new(drivers.BaseClient)
// baseCli.SetAPI(api)
// para := new(client)
// para.BaseClient = baseCli
// grpcClient := &typesmocks.Chain33Client{}
// para.grpcClient = grpcClient
// commitCli := new(commitMsgClient)
// commitCli.paraClient = para
//
// block := &types.Block{
// Height: 1,
// MainHeight: 10,
// }
//
// status := &pt.ParacrossStatus{
// Height: 1,
// }
// reply := &types.Reply{
// IsOk: true,
// Msg: types.Encode(status),
// }
// grpcClient.On("QueryChain", mock.Anything, mock.Anything).Return(reply, nil).Once()
// ret, err := commitCli.getConsensusStatus(block)
//
// assert.Nil(t, err)
// assert.Equal(t, int64(1), ret.Height)
//
// mainParaSelfConsensusForkHeight = 1
// status = &pt.ParacrossStatus{}
// api.On("QueryChain",mock.Anything, mock.Anything).Return(status,nil)
// ret, err = commitCli.getConsensusStatus(block)
// assert.Nil(t,err)
// assert.Equal(t, ret, status)
//
//}
}
...@@ -33,5 +33,5 @@ services: ...@@ -33,5 +33,5 @@ services:
- chain30 - chain30
volumes: volumes:
- ./nginx.conf:/etc/nginx/nginx.conf - ./nginx.conf:/etc/nginx/nginx.conf
ports: expose:
- "8802:8803" - "8803"
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment