Commit 8966343e authored by hezhengjun's avatar hezhengjun Committed by 33cn

simplify fetch of operation type

parent 0d5e2b35
...@@ -370,10 +370,9 @@ func (chain33Relayer *Relayer4Chain33) relayLockBurnToChain33(claim *ebTypes.Eth ...@@ -370,10 +370,9 @@ func (chain33Relayer *Relayer4Chain33) relayLockBurnToChain33(claim *ebTypes.Eth
} }
var tokenAddr string var tokenAddr string
operationType := "" operationType := events.ClaimType(claim.ClaimType).String()
if int32(events.ClaimTypeBurn) == claim.ClaimType { if int32(events.ClaimTypeBurn) == claim.ClaimType {
//burn 分支 //burn 分支
operationType = "Burn"
if ebTypes.SYMBOL_BTY == claim.Symbol { if ebTypes.SYMBOL_BTY == claim.Symbol {
tokenAddr = ebTypes.BTYAddrChain33 tokenAddr = ebTypes.BTYAddrChain33
} else { } else {
...@@ -385,7 +384,6 @@ func (chain33Relayer *Relayer4Chain33) relayLockBurnToChain33(claim *ebTypes.Eth ...@@ -385,7 +384,6 @@ func (chain33Relayer *Relayer4Chain33) relayLockBurnToChain33(claim *ebTypes.Eth
} }
} else { } else {
//lock 分支 //lock 分支
operationType = "Lock"
var exist bool var exist bool
tokenAddr, exist = chain33Relayer.symbol2Addr[claim.Symbol] tokenAddr, exist = chain33Relayer.symbol2Addr[claim.Symbol]
if !exist { if !exist {
......
...@@ -473,9 +473,8 @@ func (ethRelayer *Relayer4Ethereum) handleChain33Msg(chain33Msg *events.Chain33M ...@@ -473,9 +473,8 @@ func (ethRelayer *Relayer4Ethereum) handleChain33Msg(chain33Msg *events.Chain33M
prophecyClaim := ethtxs.Chain33MsgToProphecyClaim(*chain33Msg) prophecyClaim := ethtxs.Chain33MsgToProphecyClaim(*chain33Msg)
var tokenAddr common.Address var tokenAddr common.Address
exist := false exist := false
operationType := "" operationType := chain33Msg.ClaimType.String()
if chain33Msg.ClaimType == events.ClaimTypeLock { if chain33Msg.ClaimType == events.ClaimTypeLock {
operationType = "lock"
tokenAddr, exist = ethRelayer.symbol2Addr[prophecyClaim.Symbol] tokenAddr, exist = ethRelayer.symbol2Addr[prophecyClaim.Symbol]
if !exist { if !exist {
relayerLog.Info("handleChain33Msg", "Query address from ethereum for symbol", prophecyClaim.Symbol) relayerLog.Info("handleChain33Msg", "Query address from ethereum for symbol", prophecyClaim.Symbol)
...@@ -497,7 +496,6 @@ func (ethRelayer *Relayer4Ethereum) handleChain33Msg(chain33Msg *events.Chain33M ...@@ -497,7 +496,6 @@ func (ethRelayer *Relayer4Ethereum) handleChain33Msg(chain33Msg *events.Chain33M
tokenAddr = common.HexToAddress(addr) tokenAddr = common.HexToAddress(addr)
} }
} else { } else {
operationType = "burn"
tokenAddr, exist = ethRelayer.symbol2LockAddr[prophecyClaim.Symbol] tokenAddr, exist = ethRelayer.symbol2LockAddr[prophecyClaim.Symbol]
if !exist { if !exist {
//因为是burn操作,必须从允许lock的token地址中进行查询 //因为是burn操作,必须从允许lock的token地址中进行查询
......
...@@ -10,8 +10,9 @@ type Event int ...@@ -10,8 +10,9 @@ type Event int
var eventsLog = log.New("module", "cross2eth_relayer") var eventsLog = log.New("module", "cross2eth_relayer")
const ( const (
ClaimTypeBurn = ClaimType(1) ClaimTypeUnknown = ClaimType(0)
ClaimTypeLock = ClaimType(2) ClaimTypeBurn = ClaimType(1)
ClaimTypeLock = ClaimType(2)
) )
const ( const (
......
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