Skip to content
This repository was archived by the owner on Apr 18, 2025. It is now read-only.

Commit e3f8cc1

Browse files
lispclightsing
andauthored
upgrade Rust toolchain (#1418)
* partial.. * default enable circuit-params * clippy testool * clippy aggregator * remove unused * cargo update * fix tests * fix some default unused --------- Co-authored-by: lightsing <[email protected]> Co-authored-by: Akase Haruka <[email protected]>
1 parent 636c2c1 commit e3f8cc1

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

86 files changed

+572
-601
lines changed

Cargo.lock

Lines changed: 428 additions & 385 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

aggregator/Cargo.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,5 +44,6 @@ zstd-encoder = { package = "encoder", git = "https://github.com/scroll-tech/da-c
4444
csv = "1.1"
4545

4646
[features]
47-
default = ["revm-precompile/c-kzg"]
47+
default = ["revm-precompile/c-kzg", "halo2_proofs/circuit-params"]
48+
display = []
4849
print-trace = ["ark-std/print-trace"]

aggregator/src/aggregation/circuit.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,8 @@ impl<const N_SNARKS: usize> BatchCircuit<N_SNARKS> {
132132
impl<const N_SNARKS: usize> Circuit<Fr> for BatchCircuit<N_SNARKS> {
133133
type Config = (BatchCircuitConfig<N_SNARKS>, Challenges);
134134
type FloorPlanner = SimpleFloorPlanner;
135+
type Params = ();
136+
135137
fn without_witnesses(&self) -> Self {
136138
unimplemented!()
137139
}

aggregator/src/aggregation/decoder.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5468,6 +5468,7 @@ mod tests {
54685468
impl<const L: usize, const R: usize> Circuit<Fr> for DecoderConfigTester<L, R> {
54695469
type Config = (DecoderConfig<L, R>, U8Table, Challenges);
54705470
type FloorPlanner = SimpleFloorPlanner;
5471+
type Params = ();
54715472

54725473
fn without_witnesses(&self) -> Self {
54735474
unimplemented!()

aggregator/src/aggregation/decoder/seq_exec.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1127,6 +1127,7 @@ mod tests {
11271127
impl Circuit<Fr> for SeqExecMock {
11281128
type Config = SeqExecMockConfig;
11291129
type FloorPlanner = SimpleFloorPlanner;
1130+
type Params = ();
11301131
fn without_witnesses(&self) -> Self {
11311132
unimplemented!()
11321133
}

aggregator/src/aggregation/decoder/tables/fixed/fse_table_transition.rs

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,7 @@ use halo2_proofs::{circuit::Value, halo2curves::bn256::Fr};
22

33
use super::{FixedLookupTag, FixedLookupValues};
44

5-
pub struct RomFseTableTransition {
6-
/// The block index on the previous FSE table.
7-
pub block_idx_prev: u64,
8-
/// The block index on the current FSE table.
9-
pub block_idx_curr: u64,
10-
/// The FSE table previously decoded.
11-
pub table_kind_prev: u64,
12-
/// The FSE table currently decoded.
13-
pub table_kind_curr: u64,
14-
}
5+
pub struct RomFseTableTransition;
156

167
impl FixedLookupValues for RomFseTableTransition {
178
fn values() -> Vec<[Value<Fr>; 7]> {

aggregator/src/aggregation/decoder/tables/fixed/seq_data_interleaved_order.rs

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,7 @@ use crate::aggregation::decoder::{
55
witgen::FseTableKind,
66
};
77

8-
pub struct RomSeqDataInterleavedOrder {
9-
/// FSE table used in the previous bitstring.
10-
pub table_kind_prev: FseTableKind,
11-
/// FSE table used in the current bitstring.
12-
pub table_kind_curr: FseTableKind,
13-
/// Boolean flag to indicate whether we are initialising the FSE state.
14-
pub is_init_state: bool,
15-
/// Boolean flag to indicate whether we are updating the FSE state.
16-
pub is_update_state: bool,
17-
}
8+
pub struct RomSeqDataInterleavedOrder;
189

1910
impl FixedLookupValues for RomSeqDataInterleavedOrder {
2011
fn values() -> Vec<[Value<Fr>; 7]> {

aggregator/src/aggregation/decoder/tables/fixed/seq_tag_order.rs

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -28,22 +28,7 @@ use super::FixedLookupValues;
2828
/// - SequenceHeader > FseCode > SequenceData (MOT)
2929
/// - (0, 0, 1):
3030
/// - SequenceHeader > FseCode > SequenceData (MLT)
31-
pub struct RomSeqTagOrder {
32-
/// Boolean flag to mark if LLT is Fse_Compressed_Mode or Predefined_Mode.
33-
pub cmode_llt: bool,
34-
/// Boolean flag to mark if MOT is Fse_Compressed_Mode or Predefined_Mode.
35-
pub cmode_mot: bool,
36-
/// Boolean flag to mark if MLT is Fse_Compressed_Mode or Predefined_Mode.
37-
pub cmode_mlt: bool,
38-
/// Tag that was handled before the current tag.
39-
pub tag_prev: ZstdTag,
40-
/// Tag currently being handled.
41-
pub tag_curr: ZstdTag,
42-
/// Tag that will be handled after the current tag.
43-
pub tag_next: ZstdTag,
44-
/// The FSE table that we expect with the current tag.
45-
pub fse_table: FseTableKind,
46-
}
31+
pub struct RomSeqTagOrder;
4732

4833
impl FixedLookupValues for RomSeqTagOrder {
4934
fn values() -> Vec<[Value<Fr>; 7]> {

aggregator/src/aggregation/decoder/tables/fixed/tag_transition.rs

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,7 @@ use crate::aggregation::decoder::{tables::fixed::FixedLookupTag, witgen::ZstdTag
44

55
use super::FixedLookupValues;
66

7-
pub struct RomTagTransition {
8-
/// The current tag.
9-
pub tag: ZstdTag,
10-
/// The tag that will be processed after the current tag is finished processing.
11-
pub tag_next: ZstdTag,
12-
/// The maximum number of bytes that are needed to represent the current tag.
13-
pub max_len: u64,
14-
/// Whether this tag is processed from back-to-front or not.
15-
pub is_reverse: bool,
16-
/// Whether this tag belongs to a ``block`` in zstd or not.
17-
pub is_block: bool,
18-
}
7+
pub struct RomTagTransition;
198

209
impl FixedLookupValues for RomTagTransition {
2110
fn values() -> Vec<[Value<Fr>; 7]> {

aggregator/src/aggregation/decoder/tables/seqinst_table.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1003,6 +1003,7 @@ mod tests {
10031003
impl Circuit<Fr> for SeqTable {
10041004
type Config = SeqInstTable<Fr>;
10051005
type FloorPlanner = SimpleFloorPlanner;
1006+
type Params = ();
10061007
fn without_witnesses(&self) -> Self {
10071008
unimplemented!()
10081009
}

0 commit comments

Comments
 (0)