2.4.3 beta backports (#10508)

* version: bump beta

* Add additional request tests (#10503)

Cargo.toml

@@ -2,7 +2,7 @@
 description = "Parity Ethereum client"
 name = "parity-ethereum"
 # NOTE Make sure to update util/version/Cargo.toml as well
-version = "2.4.2"
+version = "2.4.3"
 license = "GPL-3.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 

ethcore/light/src/types/request/batch.rs

@@ -255,4 +255,78 @@ mod tests {
  hash: Field::BackReference(0, 0),
  })).unwrap();
  }
+
+ #[test]
+ fn batch_tx_index_backreference() {
+ let mut builder = Builder::default();
+ builder.push(Request::HeaderProof(IncompleteHeaderProofRequest {
+ num: 100.into(), // header proof puts hash at output 0.
+ })).unwrap();
+ builder.push(Request::TransactionIndex(IncompleteTransactionIndexRequest {
+ hash: Field::BackReference(0, 0),
+ })).unwrap();
+
+ let mut batch = builder.build();
+ batch.requests[1].fill(|_req_idx, _out_idx| Ok(Output::Hash(42.into())));
+
+ assert!(batch.next_complete().is_some());
+ batch.answered += 1;
+ assert!(batch.next_complete().is_some());
+ }
+
+ #[test]
+ #[should_panic]
+ fn batch_tx_index_backreference_wrong_output() {
+ let mut builder = Builder::default();
+ builder.push(Request::HeaderProof(IncompleteHeaderProofRequest {
+ num: 100.into(), // header proof puts hash at output 0.
+ })).unwrap();
+ builder.push(Request::TransactionIndex(IncompleteTransactionIndexRequest {
+ hash: Field::BackReference(0, 0),
+ })).unwrap();
+
+ let mut batch = builder.build();
+ batch.requests[1].fill(|_req_idx, _out_idx| Ok(Output::Number(42)));
+
+ batch.next_complete();
+ batch.answered += 1;
+ batch.next_complete();
+ }
+
+ #[test]
+ fn batch_receipts_backreference() {
+ let mut builder = Builder::default();
+ builder.push(Request::HeaderProof(IncompleteHeaderProofRequest {
+ num: 100.into(), // header proof puts hash at output 0.
+ })).unwrap();
+ builder.push(Request::Receipts(IncompleteReceiptsRequest {
+ hash: Field::BackReference(0, 0),
+ })).unwrap();
+
+ let mut batch = builder.build();
+ batch.requests[1].fill(|_req_idx, _out_idx| Ok(Output::Hash(42.into())));
+
+ assert!(batch.next_complete().is_some());
+ batch.answered += 1;
+ assert!(batch.next_complete().is_some());
+ }
+
+ #[test]
+ #[should_panic]
+ fn batch_receipts_backreference_wrong_output() {
+ let mut builder = Builder::default();
+ builder.push(Request::HeaderProof(IncompleteHeaderProofRequest {
+ num: 100.into(), // header proof puts hash at output 0.
+ })).unwrap();
+ builder.push(Request::Receipts(IncompleteReceiptsRequest {
+ hash: Field::BackReference(0, 0),
+ })).unwrap();
+
+ let mut batch = builder.build();
+ batch.requests[1].fill(|_req_idx, _out_idx| Ok(Output::Number(42)));
+
+ batch.next_complete();
+ batch.answered += 1;
+ batch.next_complete();
+ }
 }

ethcore/light/src/types/request/mod.rs

@@ -907,7 +907,7 @@ pub mod transaction_index {
  fn fill<F>(&mut self, oracle: F) where F: Fn(usize, usize) -> Result<Output, NoSuchOutput> {
  if let Field::BackReference(req, idx) = self.hash {
  self.hash = match oracle(req, idx) {
- Ok(Output::Number(hash)) => Field::Scalar(hash.into()),
+ Ok(Output::Hash(hash)) => Field::Scalar(hash.into()),
  _ => Field::BackReference(req, idx),
  }
  }
@@ -982,7 +982,7 @@ pub mod block_receipts {
  fn fill<F>(&mut self, oracle: F) where F: Fn(usize, usize) -> Result<Output, NoSuchOutput> {
  if let Field::BackReference(req, idx) = self.hash {
  self.hash = match oracle(req, idx) {
- Ok(Output::Number(hash)) => Field::Scalar(hash.into()),
+ Ok(Output::Hash(hash)) => Field::Scalar(hash.into()),
  _ => Field::BackReference(req, idx),
  }
  }

util/version/Cargo.toml

@@ -3,7 +3,7 @@
 [package]
 name = "parity-version"
 # NOTE: this value is used for Parity Ethereum version string (via env CARGO_PKG_VERSION)
-version = "2.4.2"
+version = "2.4.3"
 authors = ["Parity Technologies <admin@parity.io>"]
 build = "build.rs"