fix rustc version (#1010)

* fix rustc version * fix dockerfile * fix --------- Co-authored-by: shaorongqiang <[email protected]>
FindoraNetwork · Oct 20, 2023 · bdebeb8 · bdebeb8
1 parent 3941a55
commit bdebeb8
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 14 deletions.
diff --git a/container/Dockerfile-binary-image-dev b/container/Dockerfile-binary-image-dev
@@ -7,9 +7,9 @@ ENV PATH=$PATH:/root/.cargo/bin/
 COPY . $WORK_DIR
 WORKDIR $WORK_DIR
 
-RUN rustup toolchain install 1.70 && \
-    rustup component add clippy --toolchain 1.70 && \
-    rustup component add rustfmt --toolchain 1.70
+RUN rustup toolchain install stable && \
+    rustup component add clippy --toolchain stable && \
+    rustup component add rustfmt --toolchain stable
 
 RUN mkdir /binary
 RUN mkdir -p /binary/cleveldb && mkdir -p /binary/goleveldb

diff --git a/container/Dockerfile-binary-image-release b/container/Dockerfile-binary-image-release
@@ -7,9 +7,9 @@ ENV PATH=$PATH:/root/.cargo/bin/
 COPY . $WORK_DIR
 WORKDIR $WORK_DIR
 
-RUN rustup toolchain install 1.70 && \
-    rustup component add clippy --toolchain 1.70 && \
-    rustup component add rustfmt --toolchain 1.70
+RUN rustup toolchain install stable && \
+    rustup component add clippy --toolchain stable && \
+    rustup component add rustfmt --toolchain stable
 
 RUN mkdir /binary
 RUN mkdir -p /binary/cleveldb && mkdir -p /binary/goleveldb

diff --git a/rust-toolchain b/rust-toolchain
@@ -1 +1 @@
-1.70
+stable
diff --git a/src/components/contracts/rpc/src/eth_pubsub.rs b/src/components/contracts/rpc/src/eth_pubsub.rs
@@ -219,9 +219,8 @@ impl SubscriptionResult {
         receipts: Vec<Receipt>,
         params: &FilteredParams,
     ) -> Vec<Log> {
-        let block_hash = Some(H256::from_slice(
-            Keccak256::digest(&rlp::encode(&block.header)).as_slice(),
-        ));
+        let block_hash =
+            H256::from_slice(Keccak256::digest(&rlp::encode(&block.header)).as_slice());
         let mut logs: Vec<Log> = vec![];
         let mut log_index: u32 = 0;
         for (receipt_index, receipt) in receipts.into_iter().enumerate() {
@@ -234,12 +233,12 @@ impl SubscriptionResult {
                 None
             };
             for (transaction_log_index, log) in receipt.logs.into_iter().enumerate() {
-                if self.add_log(block_hash.unwrap(), &log, &block, params) {
+                if self.add_log(block_hash, &log, &block, params) {
                     logs.push(Log {
                         address: log.address,
                         topics: log.topics,
                         data: Bytes(log.data),
-                        block_hash,
+                        block_hash: Some(block_hash),
                         block_number: Some(block.header.number),
                         transaction_hash,
                         transaction_index: Some(U256::from(receipt_index)),

diff --git a/src/components/finutils/src/bins/cfg_generator.rs b/src/components/finutils/src/bins/cfg_generator.rs
@@ -63,7 +63,7 @@ fn gen() -> Result<()> {
     cfg_template
         .valiators
         .iter_mut()
-        .zip(id_list.into_iter())
+        .zip(id_list)
         .for_each(|(v, id)| {
             v.id = id;
         });

diff --git a/src/ledger/src/store/mod.rs b/src/ledger/src/store/mod.rs
@@ -1026,7 +1026,7 @@ impl LedgerState {
 
         let res = sids
             .into_iter()
-            .zip(aus.into_iter())
+            .zip(aus)
             .filter_map(|(sid, au)| au.map(|au| (sid, au)))
             .map(|(sid, au)| {
                 (