Merge pull request #228 from meshplus/fix/hotfix-release1.11

fix:fix model version

Author: 0xforever9

go.mod

@@ -21,7 +21,7 @@ require (
 	github.com/libp2p/go-libp2p-core v0.6.1
 	github.com/meshplus/bitxhub-core v1.3.1-0.20210524071255-789fd9ab501c
 	github.com/meshplus/bitxhub-kit v1.2.1-0.20210616114532-4849447f09e1
-	github.com/meshplus/bitxhub-model v1.2.1-0.20210629020432-d98febd566c1
+	github.com/meshplus/bitxhub-model v1.2.1-0.20210811024313-728f913a1397
 	github.com/meshplus/bitxid v0.0.0-20210412025850-e0eaf0f9063a
 	github.com/meshplus/go-bitxhub-client v1.3.1-0.20210701063659-a0836fbc1c78
 	github.com/meshplus/go-lightp2p v0.0.0-20200817105923-6b3aee40fa54

go.sum

@@ -836,6 +836,8 @@ github.com/meshplus/bitxhub-model v1.2.1-0.20210524063354-5d48e2fee178 h1:z8KGkI
 github.com/meshplus/bitxhub-model v1.2.1-0.20210524063354-5d48e2fee178/go.mod h1:vwJ+sHPUyA2JELmUUDBol+7zA+7GcqutxzqXjsN0QLA=
 github.com/meshplus/bitxhub-model v1.2.1-0.20210629020432-d98febd566c1 h1:RKzc5fRFlSpvjlz3r8hkbhWA4Jwz99lqk7J4yb/D7Rk=
 github.com/meshplus/bitxhub-model v1.2.1-0.20210629020432-d98febd566c1/go.mod h1:IjgoQrsn1wthW7XcKRqgaZqCSlqNy0SBwF/7lmGSqXc=
+github.com/meshplus/bitxhub-model v1.2.1-0.20210811024313-728f913a1397 h1:8DnVfsUewtng8Qe6/AZZ8/tFaSFz0kQk+UWSCBP7Np4=
+github.com/meshplus/bitxhub-model v1.2.1-0.20210811024313-728f913a1397/go.mod h1:IjgoQrsn1wthW7XcKRqgaZqCSlqNy0SBwF/7lmGSqXc=
 github.com/meshplus/bitxid v0.0.0-20210412025850-e0eaf0f9063a h1:c4ESPDa60Jd4zfzZIGGTyzhfaVM3vKN+xV2G9BwIDGQ=
 github.com/meshplus/bitxid v0.0.0-20210412025850-e0eaf0f9063a/go.mod h1:vAldSRfDe2Qo7exsSTbchVmZWXPY7fhWQrRw18QJHho=
 github.com/meshplus/go-bitxhub-client v1.3.1-0.20210701063659-a0836fbc1c78 h1:mPGyfyMdVjxbHHan+B1f+szCgrdnAqOUNzYz0hwgBh4=

internal/syncer/agent.go

@@ -175,7 +175,7 @@ func (syncer *WrapperSyncer) QueryIBTP(ibtpID string) (*pb.IBTP, bool, error) {
 	if err != nil {
 		return nil, false, err
 	}
-	return response.Tx.GetIBTP(), receipt.Status == pb.Receipt_SUCCESS, nil
+	return response.Txs.Transactions[0].GetIBTP(), receipt.Status == pb.Receipt_SUCCESS, nil
 }
 
 func (syncer *WrapperSyncer) ListenIBTP() <-chan *model.WrappedIBTP {

internal/syncer/syncer_test.go

@@ -296,7 +296,7 @@ func TestQueryIBTP(t *testing.T) {
 		Status: pb.Receipt_FAILED,
 	}
 	normalResponse := &pb.GetTransactionResponse{
-		Tx: normalTx,
+		Txs: &pb.Transactions{Transactions: []pb.Transaction{normalTx}},
 	}
 	//badResponse := &pb.GetTransactionResponse{
 	//	Tx: tx,

pkg/plugins/grpc.go

@@ -14,6 +14,22 @@ type GRPCServer struct {
 	Impl Client
 }
 
+func (s *GRPCServer) QueryFilterLockStart(ctx context.Context, request *pb.QueryFilterLockStartRequest) (*pb.QueryFilterLockStartResponse, error) {
+	panic("implement me")
+}
+
+func (s *GRPCServer) QueryLockEventByIndex(ctx context.Context, request *pb.QueryLockEventByIndexRequest) (*pb.LockEvent, error) {
+	panic("implement me")
+}
+
+func (s *GRPCServer) QueryAppchainIndex(ctx context.Context, empty *pb.Empty) (*pb.QueryAppchainIndexResponse, error) {
+	panic("implement me")
+}
+
+func (s *GRPCServer) QueryRelayIndex(ctx context.Context, empty *pb.Empty) (*pb.QueryRelayIndexResponse, error) {
+	panic("implement me")
+}
+
 func (s *GRPCServer) GetLockEvent(empty *pb.Empty, server pb.AppchainPlugin_GetLockEventServer) error {
 	panic("implement me")
 }

pkg/plugins/plugin_test.go

@@ -261,6 +261,22 @@ type mockAppchainPluginClient struct {
 	count uint64
 }
 
+func (mc *mockAppchainPluginClient) QueryFilterLockStart(ctx context.Context, in *pb.QueryFilterLockStartRequest, opts ...grpc.CallOption) (*pb.QueryFilterLockStartResponse, error) {
+	panic("implement me")
+}
+
+func (mc *mockAppchainPluginClient) QueryLockEventByIndex(ctx context.Context, in *pb.QueryLockEventByIndexRequest, opts ...grpc.CallOption) (*pb.LockEvent, error) {
+	panic("implement me")
+}
+
+func (mc *mockAppchainPluginClient) QueryAppchainIndex(ctx context.Context, in *pb.Empty, opts ...grpc.CallOption) (*pb.QueryAppchainIndexResponse, error) {
+	panic("implement me")
+}
+
+func (mc *mockAppchainPluginClient) QueryRelayIndex(ctx context.Context, in *pb.Empty, opts ...grpc.CallOption) (*pb.QueryRelayIndexResponse, error) {
+	panic("implement me")
+}
+
 func (*mockAppchainPluginClient) GetLockEvent(ctx context.Context, in *pb.Empty, opts ...grpc.CallOption) (pb.AppchainPlugin_GetLockEventClient, error) {
 	panic("implement me")
 }