Skip to content

Modify code style #22

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zhang0125 merged 1 commit into from
Aug 16, 2022
Merged

Modify code style #22

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 24 additions & 16 deletions bridge/setu/processor/checkpoint.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,39 +263,47 @@ func (cp *CheckpointProcessor) sendCheckpointToRootchain(eventBytes string, bloc
return err
}

if rootChain == hmTypes.RootChainTypeTron {
switch rootChain {
case hmTypes.RootChainTypeTron:
shouldSend, err := cp.shouldSendTronCheckpoint(checkpointContext, startBlock, endBlock)
if err != nil {
return err
}

if shouldSend && isCurrentProposer {
if shouldSend {
txHash := common.FromHex(txHash)
if err := cp.createAndSendCheckpointToTron(checkpointContext, startBlock, endBlock, blockHeight, txHash); err != nil {
cp.Logger.Error("Error sending checkpoint to rootchain", "error", err)
return err
}
} else {
cp.Logger.Info("I am not the current proposer or checkpoint already sent. Ignoring", "eventType", event.Type)
cp.Logger.Info("Checkpoint has already sent. Ignoring", "eventType", event.Type)
return nil
}
return nil
}
shouldSend, err := cp.shouldSendCheckpoint(checkpointContext, startBlock, endBlock, rootChain)
if err != nil {
return err
}

if shouldSend && isCurrentProposer {
txHash := common.FromHex(txHash)
if err := cp.createAndSendCheckpointToRootchain(checkpointContext, startBlock, endBlock, blockHeight, txHash, rootChain); err != nil {
cp.Logger.Error("Error sending checkpoint to rootchain", "root", rootChain, "error", err)
case hmTypes.RootChainTypeBsc, hmTypes.RootChainTypeEth:
shouldSend, err := cp.shouldSendCheckpoint(checkpointContext, startBlock, endBlock, rootChain)
if err != nil {
return err
}
} else {
cp.Logger.Info("I am not the current proposer or checkpoint already sent. Ignoring", "root", rootChain, "eventType", event.Type)
return nil

if shouldSend {
txHash := common.FromHex(txHash)
if err := cp.createAndSendCheckpointToRootchain(checkpointContext, startBlock, endBlock, blockHeight, txHash, rootChain); err != nil {
cp.Logger.Error("Error sending checkpoint to rootchain", "root", rootChain, "error", err)
return err
}
} else {
cp.Logger.Info("Checkpoint has already sent. Ignoring", "root", rootChain, "eventType", event.Type)
return nil
}

default:
err := fmt.Errorf("Unknown rootchain: %s", rootChain)
cp.Logger.Error("Error sending checkpoint to rootchain", "root", rootChain, "error", err)
return err
}

return nil
}

Expand Down