throw reverts at deployer level in addition to solidity level

synapsecns · Sep 3, 2023 · f2d2280 · f2d2280
1 parent 3f354d8
commit f2d2280
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 21 deletions.
diff --git a/agents/testutil/deployers.go b/agents/testutil/deployers.go
@@ -140,8 +140,8 @@ func (d InboxDeployer) Deploy(ctx context.Context) (contracts.DeployedContract,
 	originAddress := originContract.Address()
 	destinationAddress := destinationContract.Address()*/
 	return d.DeploySimpleContract(ctx, func(transactOps *bind.TransactOpts, backend bind.ContractBackend) (address common.Address, tx *types.Transaction, data interface{}, err error) {
-		if d.Backend().GetChainID() == SynChainID {
-			return common.Address{}, nil, nil, fmt.Errorf("could not deploy %s on synchain", d.ContractType().ContractName())
+		if d.Backend().GetChainID() != SynChainID {
+			return common.Address{}, nil, nil, fmt.Errorf("could not deploy %s on non-synchain", d.ContractType().ContractName())
 		}
 
 		// deploy the inbox contract

diff --git a/ethergo/deployer/registry.go b/ethergo/deployer/registry.go
@@ -2,15 +2,12 @@ package deployer
 
 import (
 	"context"
-	"sync"
-	"testing"
-	"time"
-
 	"github.com/neverlee/keymutex"
 	"github.com/stretchr/testify/require"
-	"github.com/synapsecns/sanguine/core/retry"
 	"github.com/synapsecns/sanguine/ethergo/backends"
 	"github.com/synapsecns/sanguine/ethergo/contracts"
+	"sync"
+	"testing"
 )
 
 // ContractDeployer is a contract deployer for a single contract type.
@@ -154,24 +151,15 @@ func (c *contractRegistryImpl) Deploy(ctx context.Context, contractType contract
 	deploymentHandle := c.deployers[contractType.ID()]
 	c.structMux.RUnlock()
 
-	var deployedContract contracts.DeployedContract
-	err := retry.WithBackoff(ctx, func(ctx context.Context) (err error) {
-		deployedContract, err = deploymentHandle.Deploy(ctx)
-		if err != nil {
-			return
-		}
-		c.backend.WaitForConfirmation(ctx, deployedContract.DeployTx())
-		err = c.backend.VerifyContract(contractType, deployedContract)
-		if err != nil {
-			return
-		}
-		logger.Debugf("added contract %s of types %s in tx %s on chain id %s", deployedContract.Address(), contractType.Name(), deployedContract.DeployTx().Hash().String(), deployedContract.ChainID().String())
-		return
-	}, retry.WithMax(120*time.Second))
+	deployedContract, err := deploymentHandle.Deploy(ctx)
 	require.Nil(c.tb, err)
+
+	c.backend.WaitForConfirmation(ctx, deployedContract.DeployTx())
+	err = c.backend.VerifyContract(contractType, deployedContract)
 	if err != nil {
 		logger.Warnf("got error %s while verifying contract, skipping", err)
 	}
+	logger.Debugf("added contract %s of types %s in tx %s on chain id %s", deployedContract.Address(), contractType.Name(), deployedContract.DeployTx().Hash().String(), deployedContract.ChainID().String())
 
 	return deployedContract
 }