From 5c958646d23646ab777a8e8b8938bc1aca89fd51 Mon Sep 17 00:00:00 2001 From: forcodedancing Date: Tue, 28 May 2024 14:10:34 +0800 Subject: [PATCH 1/3] chore: update workflows --- .github/workflows/book.yml | 132 ------------------------------------- 1 file changed, 132 deletions(-) delete mode 100644 .github/workflows/book.yml diff --git a/.github/workflows/book.yml b/.github/workflows/book.yml deleted file mode 100644 index b76a76dd..00000000 --- a/.github/workflows/book.yml +++ /dev/null @@ -1,132 +0,0 @@ -name: book - -concurrency: - cancel-in-progress: true - group: ${{github.workflow}}-${{github.ref}} - -on: - push: - branches: [main, develop] - pull_request: - branches: [main, develop] - merge_group: - -jobs: - test: - runs-on: ubuntu-latest - name: test - - steps: - - uses: actions/checkout@v4 - - - name: Install mdbook - run: | - mkdir mdbook - curl -sSL https://github.com/rust-lang/mdBook/releases/download/v0.4.14/mdbook-v0.4.14-x86_64-unknown-linux-gnu.tar.gz | tar -xz --directory=./mdbook - echo `pwd`/mdbook >> $GITHUB_PATH - - - name: Install mdbook-template - run: | - mkdir mdbook-template - curl -sSL https://github.com/sgoudham/mdbook-template/releases/latest/download/mdbook-template-x86_64-unknown-linux-gnu.tar.gz | tar -xz --directory=./mdbook-template - echo `pwd`/mdbook-template >> $GITHUB_PATH - - - name: Run tests - run: mdbook test - - lint: - runs-on: ubuntu-latest - name: lint - - steps: - - uses: actions/checkout@v4 - - - name: Install mdbook-linkcheck - run: | - mkdir mdbook-linkcheck - curl -sSL -o mdbook-linkcheck.zip https://github.com/Michael-F-Bryan/mdbook-linkcheck/releases/latest/download/mdbook-linkcheck.x86_64-unknown-linux-gnu.zip - unzip mdbook-linkcheck.zip -d ./mdbook-linkcheck - chmod +x `pwd`/mdbook-linkcheck/mdbook-linkcheck - echo `pwd`/mdbook-linkcheck >> $GITHUB_PATH - - - name: Run linkcheck - run: mdbook-linkcheck --standalone - - build: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - with: - fetch-depth: 0 - - - name: Install toolchain - uses: dtolnay/rust-toolchain@nightly - - uses: Swatinem/rust-cache@v2 - with: - cache-on-failure: true - - - name: Install mdbook - run: | - mkdir mdbook - curl -sSL https://github.com/rust-lang/mdBook/releases/download/v0.4.14/mdbook-v0.4.14-x86_64-unknown-linux-gnu.tar.gz | tar -xz --directory=./mdbook - echo `pwd`/mdbook >> $GITHUB_PATH - - - name: Install mdbook-template - run: | - mkdir mdbook-template - curl -sSL https://github.com/sgoudham/mdbook-template/releases/latest/download/mdbook-template-x86_64-unknown-linux-gnu.tar.gz | tar -xz --directory=./mdbook-template - echo `pwd`/mdbook-template >> $GITHUB_PATH - - - name: Build book - run: mdbook build documentation - - - name: Build docs - run: RUSTDOCFLAGS="--enable-index-page -Zunstable-options" cargo doc --all --no-deps - - - name: Move docs to book folder - run: | - mkdir -p target/book/docs - mv target/doc documentation/book/docs - - - name: Archive artifact - shell: sh - run: | - chmod -c -R +rX "documentation/book" | - while read line; do - echo "::warning title=Invalid file permissions automatically fixed::$line" - done - tar \ - --dereference --hard-dereference \ - --directory "documentation/book" \ - -cvf "$RUNNER_TEMP/artifact.tar" \ - --exclude=.git \ - --exclude=.github \ - . - - - name: Upload artifact - uses: actions/upload-artifact@v3 - with: - name: github-pages - path: ${{ runner.temp }}/artifact.tar - retention-days: 1 - if-no-files-found: error - - deploy: - # Only deploy if a push to main - if: github.ref_name == 'main' && github.event_name == 'push' - runs-on: ubuntu-latest - needs: [test, lint, build] - - # Grant GITHUB_TOKEN the permissions required to make a Pages deployment - permissions: - pages: write - id-token: write - - environment: - name: github-pages - url: ${{ steps.deployment.outputs.page_url }} - - steps: - - name: Deploy to GitHub Pages - id: deployment - uses: actions/deploy-pages@v4 \ No newline at end of file From 87bb9d85f1ee17fcbf9346e5cd4259a643b7a5df Mon Sep 17 00:00:00 2001 From: forcodedancing Date: Tue, 28 May 2024 14:19:19 +0800 Subject: [PATCH 2/3] fix clippy issues --- crates/interpreter/src/interpreter.rs | 1 + crates/revm/src/db/states/transition_account.rs | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/crates/interpreter/src/interpreter.rs b/crates/interpreter/src/interpreter.rs index 2a1e99a3..281a18db 100644 --- a/crates/interpreter/src/interpreter.rs +++ b/crates/interpreter/src/interpreter.rs @@ -208,6 +208,7 @@ impl Interpreter { /// - `return_revert!()`: Handles a revert by only updating the gas usage and shared memory. /// - `InstructionResult::FatalExternalError`: Sets the instruction result to a fatal external error. /// - Any other result: No specific action is taken. + #[allow(clippy::assigning_clones)] pub fn insert_call_outcome( &mut self, shared_memory: &mut SharedMemory, diff --git a/crates/revm/src/db/states/transition_account.rs b/crates/revm/src/db/states/transition_account.rs index 1dc6bc33..599bc290 100644 --- a/crates/revm/src/db/states/transition_account.rs +++ b/crates/revm/src/db/states/transition_account.rs @@ -85,7 +85,7 @@ impl TransitionAccount { /// Update new values of transition. Don't override old values. /// Both account info and old storages need to be left intact. pub fn update(&mut self, other: Self) { - self.info = other.info.clone(); + self.info.clone_from(&other.info); self.status = other.status; // if transition is from some to destroyed drop the storage. From d76fd6c6d1215c791f0a1667a05bdc14e62a3e7c Mon Sep 17 00:00:00 2001 From: forcodedancing Date: Tue, 28 May 2024 14:26:54 +0800 Subject: [PATCH 3/3] fix clippy issues --- bins/revme/src/cmd/statetest/runner.rs | 1 + crates/revm/src/db/in_memory_db.rs | 2 +- crates/revm/src/inspector/eip3155.rs | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/bins/revme/src/cmd/statetest/runner.rs b/bins/revme/src/cmd/statetest/runner.rs index b62e20c3..e23b79f7 100644 --- a/bins/revme/src/cmd/statetest/runner.rs +++ b/bins/revme/src/cmd/statetest/runner.rs @@ -211,6 +211,7 @@ fn check_evm_execution( Ok(()) } +#[allow(clippy::assigning_clones)] pub fn execute_test_suite( path: &Path, elapsed: &Arc>, diff --git a/crates/revm/src/db/in_memory_db.rs b/crates/revm/src/db/in_memory_db.rs index 7ecf5236..00ba2a90 100644 --- a/crates/revm/src/db/in_memory_db.rs +++ b/crates/revm/src/db/in_memory_db.rs @@ -482,7 +482,7 @@ mod tests { let serialized = serde_json::to_string(&init_state).unwrap(); let deserialized: CacheDB = serde_json::from_str(&serialized).unwrap(); - assert!(deserialized.accounts.get(&account).is_some()); + assert!(deserialized.accounts.contains_key(&account)); assert_eq!( deserialized.accounts.get(&account).unwrap().info.nonce, nonce diff --git a/crates/revm/src/inspector/eip3155.rs b/crates/revm/src/inspector/eip3155.rs index ca1f6cc5..c996fec9 100644 --- a/crates/revm/src/inspector/eip3155.rs +++ b/crates/revm/src/inspector/eip3155.rs @@ -192,7 +192,7 @@ impl Inspector for TracerEip3155 { fn step(&mut self, interp: &mut Interpreter, context: &mut EvmContext) { self.gas_inspector.step(interp, context); - self.stack = interp.stack.data().clone(); + self.stack.clone_from(interp.stack.data()); self.memory = if self.include_memory { Some(hex::encode_prefixed(interp.shared_memory.context_memory())) } else {