Merge branch 'develop' into upgrade-deps

Makefile

@@ -86,7 +86,7 @@ integration-release: submodule-init setup-ckb-test build
 	RUST_BACKTRACE=1 RUST_LOG=${INTEGRATION_RUST_LOG} test/run.sh -- --bin ${CARGO_TARGET_DIR}/release/ckb ${CKB_TEST_ARGS}
 
 .PHONY: integration-cov
-integration-cov: cov-install-tools submodule-init setup-ckb-test ## Run integration tests and genearte coverage report.
+integration-cov: cov-install-tools submodule-init setup-ckb-test ## Run integration tests and generate coverage report.
 	mkdir -p "${COV_PROFRAW_DIR}"; rm -f "${COV_PROFRAW_DIR}/*.profraw"
 	RUSTFLAGS="-Zinstrument-coverage" LLVM_PROFILE_FILE="${COV_PROFRAW_DIR}/ckb-cov-%p-%m.profraw" cargo +nightly-2022-03-22 build --features deadlock_detection
 	RUST_BACKTRACE=1 RUST_LOG=${INTEGRATION_RUST_LOG} test/run.sh -- --bin ${CARGO_TARGET_DIR}/debug/ckb ${CKB_TEST_ARGS}

chain/src/tests/find_fork.rs

@@ -303,7 +303,7 @@ fn test_find_fork_case4() {
     );
 }
 
-// this case is create for issuse from https://github.com/nervosnetwork/ckb/pull/1470
+// this case is create for issues from https://github.com/nervosnetwork/ckb/pull/1470
 #[test]
 fn repeatedly_switch_fork() {
     let (shared, _) = SharedBuilder::with_temp_db()

resource/src/lib.rs

@@ -88,7 +88,7 @@ impl Resource {
         Resource::Bundled { bundled }
     }
 
-    /// Creates a reference to the resource recident in the file system.
+    /// Creates a reference to the resource resident in the file system.
     pub fn file_system(file: PathBuf) -> Resource {
         Resource::FileSystem { file }
     }

script/src/error.rs

@@ -89,7 +89,7 @@ pub struct TransactionScriptError {
 }
 
 impl TransactionScriptError {
-    /// Orginating script for the generated error
+    /// Originating script for the generated error
     pub fn originating_script(&self) -> &TransactionScriptErrorSource {
         &self.source
     }
@@ -100,7 +100,7 @@ impl TransactionScriptError {
     }
 }
 
-/// It is a delibrate choice here to implement StdError directly, instead of
+/// It is a deliberate choice here to implement StdError directly, instead of
 /// implementing thiserror::Error on TransactionScriptError. This way, calling
 /// root_cause() on ckb_error::Error would return TransactionScriptError structure,
 /// providing us enough information to inspect on all kinds of errors generated when

tx-pool/src/component/pool_map.rs

@@ -554,7 +554,7 @@ impl PoolMap {
     // FIXME: In the scenario that a transaction passed all RBF rules, and then removed the conflicted
     // transaction in txpool, then failed with max ancestor limits, we now need to rollback the removing.
     // this is not an issue currently, because RBF have a rule that not allow any unknown inputs except
-    // the conflicted inputs, so the new transcation can not be in a long transaction chain.
+    // the conflicted inputs, so the new transaction can not be in a long transaction chain.
     // but it's still safer to report an error before any writing kind of operation.
     fn check_and_record_ancestors(
         &mut self,