@@ -29,7 +29,7 @@ fn split_elf_into_segs() {
29
29
// 1. split ELF into segs
30
30
let basedir = env:: var ( "BASEDIR" ) . unwrap_or ( "/tmp/cannon" . to_string ( ) ) ;
31
31
let elf_path = env:: var ( "ELF_PATH" ) . expect ( "ELF file is missing" ) ;
32
- let block_no = env:: var ( "BLOCK_NO" ) . expect ( "Block number is missing" ) ;
32
+ let block_no = env:: var ( "BLOCK_NO" ) ;
33
33
let seg_path = env:: var ( "SEG_OUTPUT" ) . expect ( "Segment output path is missing" ) ;
34
34
let seg_size = env:: var ( "SEG_SIZE" ) . unwrap_or ( format ! ( "{SEGMENT_STEPS}" ) ) ;
35
35
let seg_size = seg_size. parse :: < _ > ( ) . unwrap_or ( SEGMENT_STEPS ) ;
@@ -42,8 +42,14 @@ fn split_elf_into_segs() {
42
42
state. patch_go ( & file) ;
43
43
state. patch_stack ( & args) ;
44
44
45
- let block_path = get_block_path ( & basedir, & block_no, "" ) ;
46
- state. load_input ( & block_path) ;
45
+ let block_path = match block_no {
46
+ Ok ( no) => {
47
+ let block_path = get_block_path ( & basedir, & no, "" ) ;
48
+ state. load_input ( & block_path) ;
49
+ block_path
50
+ }
51
+ _ => "" . to_string ( ) ,
52
+ } ;
47
53
48
54
let mut instrumented_state = InstrumentedState :: new ( state, block_path) ;
49
55
instrumented_state. split_segment ( false , & seg_path) ;
@@ -66,7 +72,7 @@ fn split_elf_into_segs() {
66
72
67
73
fn prove_single_seg ( ) {
68
74
let basedir = env:: var ( "BASEDIR" ) . unwrap_or ( "/tmp/cannon" . to_string ( ) ) ;
69
- let block = env:: var ( "BLOCK_NO" ) . expect ( "Block number is missing" ) ;
75
+ let block = env:: var ( "BLOCK_NO" ) . unwrap_or ( "" . to_string ( ) ) ;
70
76
let file = env:: var ( "BLOCK_FILE" ) . unwrap_or ( String :: from ( "" ) ) ;
71
77
let seg_file = env:: var ( "SEG_FILE" ) . expect ( "Segment file is missing" ) ;
72
78
let seg_size = env:: var ( "SEG_SIZE" ) . unwrap_or ( format ! ( "{SEGMENT_STEPS}" ) ) ;
@@ -127,7 +133,7 @@ fn aggregate_proof() -> anyhow::Result<()> {
127
133
type C = PoseidonGoldilocksConfig ;
128
134
129
135
let basedir = env:: var ( "BASEDIR" ) . unwrap_or ( "/tmp/cannon" . to_string ( ) ) ;
130
- let block = env:: var ( "BLOCK_NO" ) . expect ( "Block number is missing" ) ;
136
+ let block = env:: var ( "BLOCK_NO" ) . unwrap_or ( "" . to_string ( ) ) ;
131
137
let file = env:: var ( "BLOCK_FILE" ) . unwrap_or ( String :: from ( "" ) ) ;
132
138
let seg_file = env:: var ( "SEG_FILE" ) . expect ( "first segment file is missing" ) ;
133
139
let seg_file2 = env:: var ( "SEG_FILE2" ) . expect ( "The next segment file is missing" ) ;
@@ -198,7 +204,7 @@ fn aggregate_proof_all() -> anyhow::Result<()> {
198
204
type C = PoseidonGoldilocksConfig ;
199
205
200
206
let basedir = env:: var ( "BASEDIR" ) . unwrap_or ( "/tmp/cannon" . to_string ( ) ) ;
201
- let block = env:: var ( "BLOCK_NO" ) . expect ( "Block number is missing" ) ;
207
+ let block = env:: var ( "BLOCK_NO" ) . unwrap_or ( "" . to_string ( ) ) ;
202
208
let file = env:: var ( "BLOCK_FILE" ) . unwrap_or ( String :: from ( "" ) ) ;
203
209
let seg_dir = env:: var ( "SEG_FILE_DIR" ) . expect ( "segment file dir is missing" ) ;
204
210
let seg_file_number = env:: var ( "SEG_FILE_NUM" ) . expect ( "The segment file number is missing" ) ;
0 commit comments