Excellent fix for batch request failures!

This is the core fix that addresses issue #6205. Previously, batch entries were missing the ApiPaths extension, causing the segregation layer checks (visible in segregation_layer.rs lines 106, 115) to fail and return 404 errors. Now each batch entry correctly receives the path extension.

The implementation is solid:

• Path is computed once for efficiency
• All entry types (Call, Notification) are handled
• Error entries are appropriately ignored

The AI summary mentions "add a test that sends and validates a JSON-RPC batch request," but no test file is included in this review. Please confirm that tests were added to verify this fix prevents regression.

🏁 Script executed:

#!/bin/bash
# Description: Search for tests related to batch requests to verify test coverage

# Search for test functions that mention batch
rg -nP --type=rust -C5 '#\[test\]|#\[tokio::test\]' | rg -i 'batch'

# Search for test files that might test RPC batch functionality
fd -e rs test | xargs rg -l -i 'batch.*request|rpc.*batch'

Length of output: 2000

🏁 Script executed:

#!/bin/bash
# Description: Search for set_extension_layer.rs and check for tests

# Find the file
fd -name 'set_extension_layer.rs' -type f

# Look for test module in the file
fd -name 'set_extension_layer.rs' -type f -exec cat {} \; | grep -A 100 '#\[cfg(test)\]'

Length of output: 461

🏁 Script executed:

#!/bin/bash
# Description: Find set_extension_layer.rs and check for tests

# Find the file
FILE=$(find . -name 'set_extension_layer.rs' -type f)
echo "Found file: $FILE"

# Check if file exists and show its full content to look for tests
if [ -f "$FILE" ]; then
  echo "=== Full file content ==="
  cat "$FILE"
fi

Length of output: 2293

🏁 Script executed:

#!/bin/bash
# Description: Search for tests related to SetExtensionLayer and batch requests

# Search for test files that reference SetExtensionLayer
rg -n 'SetExtensionLayer|set_extension_layer' --type=rust -g '**/*test*' -g '**/tests/**'

# Also search for tests in the rpc module
fd -path '*/rpc/*test*' -o -path '*/tests/*rpc*' -type f

# Look for tests that import or use the set_extension_layer module
rg -n 'mod set_extension_layer|use.*set_extension_layer' --type=rust

Length of output: 273

🏁 Script executed:

#!/bin/bash
# Description: Search for RPC and batch tests more broadly

# Look for test files in rpc directory
find ./src/rpc -name '*.rs' -type f

# Search for any batch request tests
rg -n 'batch.*test|test.*batch' --type=rust -i

# Look for tests directory structure
find . -type d -name tests -o -type d -name test

Length of output: 3057

🏁 Script executed:

#!/bin/bash
# Check the calibnet_other_check.sh test file for the batch request test
cat scripts/tests/calibnet_other_check.sh | head -100

Length of output: 3407

[src/rpc/segregation_layer.rs, lines 52-54]

fn layer(&self, service: S) -> Self::Service {
SegregationService { service }
}

[src/rpc/segregation_layer.rs, lines 95-103]

fn call<'a>(
&self,
req: jsonrpsee::types::Request<'a>,
) -> impl Future<Output = Self::MethodResponse> + Send + 'a {
match self.check(req.extensions().get::(), req.method_name()) {
Ok(()) => Either::Left(self.service.call(req)),
Err(e) => Either::Right(async move { MethodResponse::error(req.id(), e) }),
}
}

[src/rpc/segregation_layer.rs, lines 105-125]

fn batch<'a>(&self, batch: Batch<'a>) -> impl Future<Output = Self::BatchResponse> + Send + 'a {
let entries = batch
.into_iter()
.filter_map(|entry| match entry {
Ok(BatchEntry::Call(req)) => Some(
match self.check(req.extensions().get::(), req.method_name()) {
Ok(()) => Ok(BatchEntry::Call(req)),
Err(e) => Err(BatchEntryErr::new(req.id(), e)),
},
),
Ok(BatchEntry::Notification(n)) => {
match self.check(n.extensions().get::(), n.method_name()) {
Ok() => Some(Ok(BatchEntry::Notification(n))),
Err() => None,
}
}
Err(err) => Some(Err(err)),
})
.collect_vec();
self.service.batch(Batch::from(entries))
}