Skip to content

Commit

Permalink
Merge branch 'feat/scroll-rpc1' of github.com:scroll-tech/reth into f…
Browse files Browse the repository at this point in the history
…eat/scroll-rpc1
  • Loading branch information
georgehao committed Jan 21, 2025
2 parents 43964b8 + 7026d1c commit 6000f2e
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 4 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/unit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@ concurrency:
jobs:
test:
name: test / ${{ matrix.type }} (${{ matrix.partition }}/${{ matrix.total_partitions }})
runs-on: ubuntu-latest
runs-on:
group: scroll-reth-runner-group
env:
RUST_BACKTRACE: 1
strategy:
Expand Down
2 changes: 1 addition & 1 deletion crates/scroll/alloy/consensus/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
Scroll consensus interface.

This crate contains constants, types, and functions for implementing Scroll EL consensus and communication. This
includes an extended `ScrollTxEnvelope` type with deposit transactions
includes an extended `ScrollTxEnvelope` type with l1 messages.

In general a type belongs in this crate if it exists in the `alloy-consensus` crate, but was modified from the base Ethereum protocol in Scroll.
For consensus types that are not modified by Scroll, the `alloy-consensus` types should be used instead.
Expand Down
4 changes: 2 additions & 2 deletions crates/scroll/alloy/rpc-types/src/receipt.rs
Original file line number Diff line number Diff line change
Expand Up @@ -172,9 +172,9 @@ mod tests {

#[test]
fn serialize_empty_optimism_transaction_receipt_fields_struct() {
let op_fields = ScrollTransactionReceiptFields::default();
let scroll_fields = ScrollTransactionReceiptFields::default();

let json = serde_json::to_value(op_fields).unwrap();
let json = serde_json::to_value(scroll_fields).unwrap();
assert_eq!(json, json!({}));
}
}

0 comments on commit 6000f2e

Please sign in to comment.