|
6 | 6 | "testing"
|
7 | 7 | "time"
|
8 | 8 |
|
9 |
| - "github.com/ethereum-optimism/optimism/op-service/eth" |
10 | 9 | "github.com/ethereum-optimism/optimism/op-service/txmgr"
|
11 | 10 | "github.com/ethereum/go-ethereum/common"
|
12 | 11 | "github.com/ethereum/go-ethereum/common/math"
|
@@ -87,6 +86,8 @@ func (s *ProposerTestSuite) SetupTest() {
|
87 | 86 | MaxTierFeePriceBumps: 3,
|
88 | 87 | ExtraData: "test",
|
89 | 88 | L1BlockBuilderTip: common.Big0,
|
| 89 | + BlobAllowed: true, |
| 90 | + ProposeBlockTxGasLimit: 10000000, |
90 | 91 | TxmgrConfigs: &txmgr.CLIConfig{
|
91 | 92 | L1RPCURL: os.Getenv("L1_NODE_WS_ENDPOINT"),
|
92 | 93 | NumConfirmations: 0,
|
@@ -178,22 +179,15 @@ func (s *ProposerTestSuite) TestProposeTxLists() {
|
178 | 179 | }
|
179 | 180 |
|
180 | 181 | // trigger the error
|
181 |
| - candidate.Blobs = []*eth.Blob{} |
182 | 182 | candidate.GasLimit = 10000000
|
183 | 183 |
|
184 | 184 | txCandidates[i] = *candidate
|
185 | 185 | }
|
186 | 186 |
|
187 |
| - var errors []error |
188 | 187 | for _, txCandidate := range txCandidates {
|
189 | 188 | receipt, err := p.txmgr.Send(ctx, txCandidate)
|
190 | 189 | s.Nil(err)
|
191 |
| - errors = append(errors, encoding.TryParsingCustomErrorFromReceipt(ctx, p.rpc.L1, p.proposerAddress, receipt)) |
192 |
| - } |
193 |
| - |
194 |
| - // confirm errors handled |
195 |
| - for _, err := range errors { |
196 |
| - s.Equal("L1_BLOB_NOT_AVAILABLE", err.Error()) |
| 190 | + s.Nil(encoding.TryParsingCustomErrorFromReceipt(ctx, p.rpc.L1, p.proposerAddress, receipt)) |
197 | 191 | }
|
198 | 192 | }
|
199 | 193 |
|
@@ -260,9 +254,6 @@ func (s *ProposerTestSuite) TestProposeOpNoEmptyBlock() {
|
260 | 254 | s.Nil(err)
|
261 | 255 | s.Equal(true, len(preBuiltTxList) > 0)
|
262 | 256 |
|
263 |
| - txsCh, err := s.getLatestProposedTxs(len(preBuiltTxList), time.Minute) |
264 |
| - s.Nil(err) |
265 |
| - |
266 | 257 | var (
|
267 | 258 | blockMinGasLimit uint64 = math.MaxUint64
|
268 | 259 | blockMinTxListBytes uint64 = math.MaxUint64
|
@@ -290,10 +281,6 @@ func (s *ProposerTestSuite) TestProposeOpNoEmptyBlock() {
|
290 | 281 | p.MinProposingInternal = time.Minute
|
291 | 282 | s.Nil(p.ProposeOp(context.Background()))
|
292 | 283 |
|
293 |
| - txs := <-txsCh |
294 |
| - for i := 0; i < len(txLists); i++ { |
295 |
| - s.Equal(txLists[i].Len(), txs[i].Len()) |
296 |
| - } |
297 | 284 | }
|
298 | 285 |
|
299 | 286 | func (s *ProposerTestSuite) TestName() {
|
|
0 commit comments