* chore: cargo +nightly clippy --fix -Z unstable-options (cherry picked from commit6514096a67) # Conflicts: # core/src/banking_stage.rs # core/src/cost_model.rs # core/src/cost_tracker.rs # core/src/execute_cost_table.rs # core/src/replay_stage.rs # core/src/tvu.rs # ledger-tool/src/main.rs # programs/bpf_loader/build.rs # rbpf-cli/src/main.rs # sdk/cargo-build-bpf/src/main.rs # sdk/cargo-test-bpf/src/main.rs # sdk/src/secp256k1_instruction.rs * chore: cargo fmt (cherry picked from commit789f33e8db) * Updates BPF program assert_instruction_count tests. (cherry picked from commitc1e03f3410) # Conflicts: # programs/bpf/tests/programs.rs * Resolve conflicts Co-authored-by: Alexander Meißner <AlexanderMeissner@gmx.net> Co-authored-by: Michael Vines <mvines@gmail.com>
This commit is contained in:
		| @@ -28,7 +28,7 @@ fn load_local_genesis( | ||||
|     ledger_path: &std::path::Path, | ||||
|     expected_genesis_hash: Option<Hash>, | ||||
| ) -> Result<GenesisConfig, String> { | ||||
|     let existing_genesis = GenesisConfig::load(&ledger_path) | ||||
|     let existing_genesis = GenesisConfig::load(ledger_path) | ||||
|         .map_err(|err| format!("Failed to load genesis config: {}", err))?; | ||||
|     check_genesis_hash(&existing_genesis, expected_genesis_hash)?; | ||||
|  | ||||
| @@ -54,12 +54,12 @@ pub fn download_then_check_genesis_hash( | ||||
|     { | ||||
|         unpack_genesis_archive( | ||||
|             &tmp_genesis_package, | ||||
|             &ledger_path, | ||||
|             ledger_path, | ||||
|             max_genesis_archive_unpacked_size, | ||||
|         ) | ||||
|         .map_err(|err| format!("Failed to unpack downloaded genesis config: {}", err))?; | ||||
|  | ||||
|         let downloaded_genesis = GenesisConfig::load(&ledger_path) | ||||
|         let downloaded_genesis = GenesisConfig::load(ledger_path) | ||||
|             .map_err(|err| format!("Failed to load downloaded genesis config: {}", err))?; | ||||
|  | ||||
|         check_genesis_hash(&downloaded_genesis, expected_genesis_hash)?; | ||||
|   | ||||
		Reference in New Issue
	
	Block a user