Skip to content

Commit

Permalink
trying to fix flake
Browse files Browse the repository at this point in the history
  • Loading branch information
AnieeG committed Oct 15, 2024
1 parent df255ff commit ca23471
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 4 deletions.
21 changes: 17 additions & 4 deletions integration-tests/deployment/ccip/deploy_home_chain.go
Original file line number Diff line number Diff line change
Expand Up @@ -570,7 +570,7 @@ func setupExecDON(

execCandidateDigest, err := ccipHome.GetCandidateDigest(nil, donID, execConfig.PluginType)
if err != nil {
return fmt.Errorf("get commit candidate digest: %w", err)
return fmt.Errorf("get exec candidate digest 1st time: %w", err)
}

if execCandidateDigest == [32]byte{} {
Expand Down Expand Up @@ -605,11 +605,24 @@ func setupExecDON(
if err != nil {
return fmt.Errorf("update don w/ exec config: %w", err)
}

if _, err := deployment.ConfirmIfNoError(home, tx, err); err != nil {
bn, err := deployment.ConfirmIfNoError(home, tx, err)
if err != nil {
return fmt.Errorf("confirm update don w/ exec config: %w", err)
}

if bn == 0 {
return fmt.Errorf("UpdateDON tx not confirmed")
}
// check if candidate digest is promoted
pEvent, err := ccipHome.FilterConfigPromoted(&bind.FilterOpts{
Context: context.Background(),
Start: bn,
}, [][32]byte{execCandidateDigest})
if err != nil {
return fmt.Errorf("filter exec config promoted: %w", err)
}
if !pEvent.Next() {
return fmt.Errorf("exec config not promoted")
}
// check that candidate digest is empty.
execCandidateDigest, err = ccipHome.GetCandidateDigest(nil, donID, execConfig.PluginType)
if err != nil {
Expand Down
3 changes: 3 additions & 0 deletions integration-tests/deployment/devenv/chain.go
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,9 @@ func NewChains(logger logger.Logger, configs []ChainConfig) (map[uint64]deployme
if err != nil {
return retry.RetryableError(fmt.Errorf("failed to get receipt for chain %d: %w", chainId, err))
}
if receipt == nil {
return retry.RetryableError(fmt.Errorf("receipt was nil for tx %s", tx.Hash().Hex()))
}
if receipt != nil {
blockNumber = receipt.BlockNumber.Uint64()
}
Expand Down

0 comments on commit ca23471

Please sign in to comment.