Commit 165af6d9 authored by hezhengjun's avatar hezhengjun

figx build error

parent 360e53e3
...@@ -273,7 +273,7 @@ message WithdrawTx { ...@@ -273,7 +273,7 @@ message WithdrawTx {
int32 month = 10; int32 month = 10;
int32 day = 11; int32 day = 11;
int32 status = 12; int32 status = 12;
int32 statusDescription = 13; string statusDescription = 13;
string errorDescription = 14; string errorDescription = 14;
} }
......
...@@ -572,7 +572,7 @@ func (ethRelayer *Relayer4Ethereum) handleLogWithdraw(chain33Msg *events.Chain33 ...@@ -572,7 +572,7 @@ func (ethRelayer *Relayer4Ethereum) handleLogWithdraw(chain33Msg *events.Chain33
} }
defer func() { defer func() {
if err != nil { if err != nil {
withdrawTx.Status = err.Error() withdrawTx.ErrorDescription = err.Error()
relayerLog.Error("handleLogWithdraw", "Failed to withdraw due to:", err.Error()) relayerLog.Error("handleLogWithdraw", "Failed to withdraw due to:", err.Error())
} }
...@@ -690,7 +690,7 @@ func (ethRelayer *Relayer4Ethereum) handleLogWithdraw(chain33Msg *events.Chain33 ...@@ -690,7 +690,7 @@ func (ethRelayer *Relayer4Ethereum) handleLogWithdraw(chain33Msg *events.Chain33
} }
relayerLog.Info("handleLogWithdraw", "SendTransaction Hash", signedTx.Hash()) relayerLog.Info("handleLogWithdraw", "SendTransaction Hash", signedTx.Hash())
withdrawTx.Status = "Withdraw Tx has been sent to Ethereum" withdrawTx.StatusDescription = "Withdraw Tx has been sent to Ethereum"
withdrawTx.TxHashOnEthereum = signedTx.Hash().String() withdrawTx.TxHashOnEthereum = signedTx.Hash().String()
return return
} }
......
...@@ -2612,7 +2612,7 @@ type WithdrawTx struct { ...@@ -2612,7 +2612,7 @@ type WithdrawTx struct {
Month int32 `protobuf:"varint,10,opt,name=month,proto3" json:"month,omitempty"` Month int32 `protobuf:"varint,10,opt,name=month,proto3" json:"month,omitempty"`
Day int32 `protobuf:"varint,11,opt,name=day,proto3" json:"day,omitempty"` Day int32 `protobuf:"varint,11,opt,name=day,proto3" json:"day,omitempty"`
Status int32 `protobuf:"varint,12,opt,name=status,proto3" json:"status,omitempty"` Status int32 `protobuf:"varint,12,opt,name=status,proto3" json:"status,omitempty"`
StatusDescription int32 `protobuf:"varint,13,opt,name=statusDescription,proto3" json:"statusDescription,omitempty"` StatusDescription string `protobuf:"bytes,13,opt,name=statusDescription,proto3" json:"statusDescription,omitempty"`
ErrorDescription string `protobuf:"bytes,14,opt,name=errorDescription,proto3" json:"errorDescription,omitempty"` ErrorDescription string `protobuf:"bytes,14,opt,name=errorDescription,proto3" json:"errorDescription,omitempty"`
} }
...@@ -2725,11 +2725,11 @@ func (x *WithdrawTx) GetStatus() int32 { ...@@ -2725,11 +2725,11 @@ func (x *WithdrawTx) GetStatus() int32 {
return 0 return 0
} }
func (x *WithdrawTx) GetStatusDescription() int32 { func (x *WithdrawTx) GetStatusDescription() string {
if x != nil { if x != nil {
return x.StatusDescription return x.StatusDescription
} }
return 0 return ""
} }
func (x *WithdrawTx) GetErrorDescription() string { func (x *WithdrawTx) GetErrorDescription() string {
...@@ -3132,7 +3132,7 @@ var file_relayer_proto_rawDesc = []byte{ ...@@ -3132,7 +3132,7 @@ var file_relayer_proto_rawDesc = []byte{
0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x64, 0x61, 0x79, 0x12, 0x16, 0x0a, 0x06, 0x73, 0x74, 0x61, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x64, 0x61, 0x79, 0x12, 0x16, 0x0a, 0x06, 0x73, 0x74, 0x61,
0x74, 0x75, 0x73, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x74, 0x75, 0x73, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75,
0x73, 0x12, 0x2c, 0x0a, 0x11, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x44, 0x65, 0x73, 0x63, 0x72, 0x73, 0x12, 0x2c, 0x0a, 0x11, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x44, 0x65, 0x73, 0x63, 0x72,
0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x05, 0x52, 0x11, 0x73, 0x74, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x09, 0x52, 0x11, 0x73, 0x74,
0x61, 0x74, 0x75, 0x73, 0x44, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x61, 0x74, 0x75, 0x73, 0x44, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x12,
0x2a, 0x0a, 0x10, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x44, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x2a, 0x0a, 0x10, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x44, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74,
0x69, 0x6f, 0x6e, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x09, 0x52, 0x10, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x69, 0x6f, 0x6e, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x09, 0x52, 0x10, 0x65, 0x72, 0x72, 0x6f, 0x72,
......
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