diff --git a/testutils/helper.go b/testutils/helper.go index e3ef0b97f..366e5b4f9 100644 --- a/testutils/helper.go +++ b/testutils/helper.go @@ -6,7 +6,6 @@ import ( "crypto/rand" "errors" "fmt" - "math/big" "net/http" "net/url" "os" @@ -17,13 +16,11 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common/hexutil" "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" "github.com/ethereum/go-ethereum/log" "github.com/ethereum/go-ethereum/rlp" "github.com/go-resty/resty/v2" "github.com/phayes/freeport" "github.com/taikoxyz/taiko-client/bindings" - "github.com/taikoxyz/taiko-client/bindings/encoding" capacity "github.com/taikoxyz/taiko-client/prover/capacity_manager" "github.com/taikoxyz/taiko-client/prover/server" ) @@ -31,13 +28,7 @@ import ( func ProposeInvalidTxListBytes(s *ClientTestSuite, proposer Proposer) { invalidTxListBytes := RandomBytes(256) - s.Nil(proposer.ProposeTxList(context.Background(), &encoding.TaikoL1BlockMetadataInput{ - Proposer: proposer.L2SuggestedFeeRecipient(), - TxListHash: crypto.Keccak256Hash(invalidTxListBytes), - TxListByteStart: common.Big0, - TxListByteEnd: new(big.Int).SetUint64(uint64(len(invalidTxListBytes))), - CacheTxListInfo: false, - }, invalidTxListBytes, 1, nil)) + s.Nil(proposer.ProposeTxList(context.Background(), invalidTxListBytes, 1, nil)) } func ProposeAndInsertEmptyBlocks( @@ -64,13 +55,7 @@ func ProposeAndInsertEmptyBlocks( encoded, err := rlp.EncodeToBytes(emptyTxs) s.Nil(err) - s.Nil(proposer.ProposeTxList(context.Background(), &encoding.TaikoL1BlockMetadataInput{ - Proposer: proposer.L2SuggestedFeeRecipient(), - TxListHash: crypto.Keccak256Hash(encoded), - TxListByteStart: common.Big0, - TxListByteEnd: new(big.Int).SetUint64(uint64(len(encoded))), - CacheTxListInfo: false, - }, encoded, 0, nil)) + s.Nil(proposer.ProposeTxList(context.Background(), encoded, 0, nil)) ProposeInvalidTxListBytes(s, proposer) @@ -203,7 +188,7 @@ func NewTestProverServer( CapacityManager: capacityManager, TaikoL1Address: common.HexToAddress(os.Getenv("TAIKO_L1_ADDRESS")), Rpc: s.RpcClient, - Bond: protocolConfig.ProofBond, + Bond: protocolConfig.LivenessBond, IsOracle: true, }) s.Nil(err) diff --git a/testutils/interfaces.go b/testutils/interfaces.go index 17fa62b34..348aa1e00 100644 --- a/testutils/interfaces.go +++ b/testutils/interfaces.go @@ -5,7 +5,6 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/core/types" - "github.com/taikoxyz/taiko-client/bindings/encoding" "github.com/taikoxyz/taiko-client/cmd/utils" ) @@ -20,7 +19,6 @@ type Proposer interface { L2SuggestedFeeRecipient() common.Address ProposeTxList( ctx context.Context, - meta *encoding.TaikoL1BlockMetadataInput, txListBytes []byte, txNum uint, nonce *uint64,