op-e2e: better assertions

op-e2e/bridge_test.go

@@ -42,34 +42,34 @@ func TestERC20BridgeDeposits(t *testing.T) {
 
 	// Deploy WETH9
 	weth9Address, tx, WETH9, err := bindings.DeployWETH9(opts, l1Client)
-	require.NotNil(t, err)
+	require.NoError(t, err)
 	_, err = waitForTransaction(tx.Hash(), l1Client, 3*time.Duration(cfg.DeployConfig.L1BlockTime)*time.Second)
-	require.Nil(t, err, "Waiting for deposit tx on L1")
+	require.NoError(t, err, "Waiting for deposit tx on L1")
 
 	// Get some WETH
 	opts.Value = big.NewInt(params.Ether)
 	tx, err = WETH9.Fallback(opts, []byte{})
-	require.Nil(t, err)
+	require.NoError(t, err)
 	_, err = waitForTransaction(tx.Hash(), l1Client, 3*time.Duration(cfg.DeployConfig.L1BlockTime)*time.Second)
-	require.Nil(t, err)
+	require.NoError(t, err)
 	opts.Value = nil
 	wethBalance, err := WETH9.BalanceOf(&bind.CallOpts{}, opts.From)
-	require.NotNil(t, err)
+	require.NoError(t, err)
 	require.Equal(t, big.NewInt(params.Ether), wethBalance)
 
 	// Deploy L2 WETH9
 	l2Opts, err := bind.NewKeyedTransactorWithChainID(sys.cfg.Secrets.Alice, cfg.L2ChainIDBig())
-	require.Nil(t, err)
+	require.NoError(t, err)
 	optimismMintableTokenFactory, err := bindings.NewOptimismMintableERC20Factory(predeploys.OptimismMintableERC20FactoryAddr, l2Client)
-	require.Nil(t, err)
+	require.NoError(t, err)
 	tx, err = optimismMintableTokenFactory.CreateOptimismMintableERC20(l2Opts, weth9Address, "L2-WETH", "L2-WETH")
-	require.NotNil(t, err)
+	require.NoError(t, err)
 	_, err = waitForTransaction(tx.Hash(), l2Client, 3*time.Duration(cfg.DeployConfig.L2BlockTime)*time.Second)
-	require.NotNil(t, err)
+	require.NoError(t, err)
 
 	// Get the deployment event to have access to the L2 WETH9 address
 	it, err := optimismMintableTokenFactory.FilterOptimismMintableERC20Created(&bind.FilterOpts{Start: 0}, nil, nil)
-	require.Nil(t, err)
+	require.NoError(t, err)
 	var event *bindings.OptimismMintableERC20FactoryOptimismMintableERC20Created
 	for it.Next() {
 		event = it.Event
@@ -78,26 +78,26 @@ func TestERC20BridgeDeposits(t *testing.T) {
 
 	// Approve WETH9 with the bridge
 	tx, err = WETH9.Approve(opts, predeploys.DevL1StandardBridgeAddr, new(big.Int).SetUint64(math.MaxUint64))
-	require.Nil(t, err)
+	require.NoError(t, err)
 	_, err = waitForTransaction(tx.Hash(), l1Client, 3*time.Duration(cfg.DeployConfig.L1BlockTime)*time.Second)
-	require.Nil(t, err)
+	require.NoError(t, err)
 
 	// Bridge the WETH9
 	l1StandardBridge, err := bindings.NewL1StandardBridge(predeploys.DevL1StandardBridgeAddr, l1Client)
-	require.Nil(t, err)
+	require.NoError(t, err)
 	tx, err = l1StandardBridge.BridgeERC20(opts, weth9Address, event.LocalToken, big.NewInt(100), 100000, []byte{})
-	require.Nil(t, err)
+	require.NoError(t, err)
 	depositReceipt, err := waitForTransaction(tx.Hash(), l1Client, 3*time.Duration(cfg.DeployConfig.L1BlockTime)*time.Second)
-	require.Nil(t, err)
+	require.NoError(t, err)
 
 	t.Log("Deposit through L1StandardBridge", "gas used", depositReceipt.GasUsed)
 
 	// compute the deposit transaction hash + poll for it
 	portal, err := bindings.NewOptimismPortal(predeploys.DevOptimismPortalAddr, l1Client)
-	require.Nil(t, err)
+	require.NoError(t, err)
 
 	depIt, err := portal.FilterTransactionDeposited(&bind.FilterOpts{Start: 0}, nil, nil, nil)
-	require.Nil(t, err)
+	require.NoError(t, err)
 	var depositEvent *bindings.OptimismPortalTransactionDeposited
 	for depIt.Next() {
 		depositEvent = depIt.Event
@@ -105,15 +105,16 @@ func TestERC20BridgeDeposits(t *testing.T) {
 	require.NotNil(t, depositEvent)
 
 	depositTx, err := derive.UnmarshalDepositLogEvent(&depositEvent.Raw)
-	require.Nil(t, err)
+	require.NoError(t, err)
 	_, err = waitForTransaction(types.NewTx(depositTx).Hash(), l2Client, 3*time.Duration(cfg.DeployConfig.L2BlockTime)*time.Second)
+	require.NoError(t, err)
 
 	// Ensure that the deposit went through
 	optimismMintableToken, err := bindings.NewOptimismMintableERC20(event.LocalToken, l2Client)
-	require.Nil(t, err)
+	require.NoError(t, err)
 
 	// Should have balance on L2
 	l2Balance, err := optimismMintableToken.BalanceOf(&bind.CallOpts{}, opts.From)
-	require.Nil(t, err)
+	require.NoError(t, err)
 	require.Equal(t, l2Balance, big.NewInt(100))
 }