Commit 58fe52b7 authored by Mark Tyneway's avatar Mark Tyneway Committed by GitHub

op-service: decouple from `op-bindings` (#10491)

This moves the ERC20 bindings that the `op-service` tests
depend on into the `test` package that already exists.
This ensures that these bindings can always exist safely and
be used as part of the tests.
parent bbe7d14a
......@@ -4,7 +4,7 @@ import (
"math/big"
"testing"
"github.com/ethereum-optimism/optimism/op-bindings/bindings"
"github.com/ethereum-optimism/optimism/op-service/sources/batching/test"
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/core/types"
"github.com/stretchr/testify/require"
......@@ -14,7 +14,7 @@ func TestDecodeCall(t *testing.T) {
method := "approve"
spender := common.Address{0xbb, 0xee}
amount := big.NewInt(4242)
testAbi, err := bindings.ERC20MetaData.GetAbi()
testAbi, err := test.ERC20MetaData.GetAbi()
require.NoError(t, err)
validData, err := testAbi.Pack(method, spender, amount)
require.NoError(t, err)
......@@ -54,7 +54,7 @@ func TestDecodeCall(t *testing.T) {
}
func TestDecodeEvent(t *testing.T) {
testAbi, err := bindings.ERC20MetaData.GetAbi()
testAbi, err := test.ERC20MetaData.GetAbi()
require.NoError(t, err)
// event Transfer(address indexed from, address indexed to, uint256 amount);
......
......@@ -4,7 +4,7 @@ import (
"math/big"
"testing"
"github.com/ethereum-optimism/optimism/op-bindings/bindings"
"github.com/ethereum-optimism/optimism/op-service/sources/batching/test"
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/common/hexutil"
"github.com/stretchr/testify/require"
......@@ -12,7 +12,7 @@ import (
func TestContractCall_ToCallArgs(t *testing.T) {
addr := common.Address{0xbd}
testAbi, err := bindings.ERC20MetaData.GetAbi()
testAbi, err := test.ERC20MetaData.GetAbi()
require.NoError(t, err)
call := NewContractCall(testAbi, addr, "approve", common.Address{0xcc}, big.NewInt(1234444))
call.From = common.Address{0xab}
......@@ -33,7 +33,7 @@ func TestContractCall_ToCallArgs(t *testing.T) {
func TestContractCall_ToTxCandidate(t *testing.T) {
addr := common.Address{0xbd}
testAbi, err := bindings.ERC20MetaData.GetAbi()
testAbi, err := test.ERC20MetaData.GetAbi()
require.NoError(t, err)
call := NewContractCall(testAbi, addr, "approve", common.Address{0xcc}, big.NewInt(1234444))
candidate, err := call.ToTxCandidate()
......@@ -49,7 +49,7 @@ func TestContractCall_ToTxCandidate(t *testing.T) {
func TestContractCall_Pack(t *testing.T) {
addr := common.Address{0xbd}
testAbi, err := bindings.ERC20MetaData.GetAbi()
testAbi, err := test.ERC20MetaData.GetAbi()
require.NoError(t, err)
sender := common.Address{0xcc}
amount := big.NewInt(1234444)
......@@ -64,7 +64,7 @@ func TestContractCall_Pack(t *testing.T) {
func TestContractCall_PackInvalid(t *testing.T) {
addr := common.Address{0xbd}
testAbi, err := bindings.ERC20MetaData.GetAbi()
testAbi, err := test.ERC20MetaData.GetAbi()
require.NoError(t, err)
// Second arg should be a *big.Int so packing should fail
call := NewContractCall(testAbi, addr, "approve", common.Address{0xcc}, uint32(123))
......@@ -74,7 +74,7 @@ func TestContractCall_PackInvalid(t *testing.T) {
func TestContractCall_Unpack(t *testing.T) {
addr := common.Address{0xbd}
testAbi, err := bindings.ERC20MetaData.GetAbi()
testAbi, err := test.ERC20MetaData.GetAbi()
require.NoError(t, err)
call := NewContractCall(testAbi, addr, "balanceOf", common.Address{0xcc})
outputs := testAbi.Methods["balanceOf"].Outputs
......@@ -89,7 +89,7 @@ func TestContractCall_Unpack(t *testing.T) {
func TestContractCall_UnpackInvalid(t *testing.T) {
addr := common.Address{0xbd}
testAbi, err := bindings.ERC20MetaData.GetAbi()
testAbi, err := test.ERC20MetaData.GetAbi()
require.NoError(t, err)
call := NewContractCall(testAbi, addr, "balanceOf", common.Address{0xcc})
......
This diff is collapsed.
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