Addressing review comments

- Remove root_context_id from RootContext's create_http_stream
  and create_http_context calls
- Move EmptyHttpContext after HttpContext declaration
- Reorder trait impl's in examples to be consistent

Signed-off-by: Daniel Grimm <dgrimm@redhat.com>

Author: dgn

examples/http_auth_random.rs

@@ -26,17 +26,35 @@ pub fn _start() {
 struct HttpAuthRandom;
 struct HttpAuthRandomRoot;
 
+impl Context for HttpAuthRandomRoot {}
+
 impl RootContext for HttpAuthRandomRoot {
     fn get_type(&self) -> ContextType {
         ContextType::HttpContext
     }
 
-    fn create_http_context(&self, _root_context_id: u32, _context_id: u32) -> Box<dyn HttpContext> {
+    fn create_http_context(&self, _context_id: u32) -> Box<dyn HttpContext> {
         Box::new(HttpAuthRandom)
     }
 }
 
-impl Context for HttpAuthRandomRoot {}
+impl Context for HttpAuthRandom {
+    fn on_http_call_response(&mut self, _: u32, _: usize, body_size: usize, _: usize) {
+        if let Some(body) = self.get_http_call_response_body(0, body_size) {
+            if !body.is_empty() && body[0] % 2 == 0 {
+                trace!("Access granted.");
+                self.resume_http_request();
+                return;
+            }
+        }
+        trace!("Access forbidden.");
+        self.send_http_response(
+            403,
+            vec![("Powered-By", "proxy-wasm")],
+            Some(b"Access forbidden.\n"),
+        );
+    }
+}
 
 impl HttpContext for HttpAuthRandom {
     fn on_http_request_headers(&mut self, _: usize) -> Action {
@@ -60,21 +78,3 @@ impl HttpContext for HttpAuthRandom {
         Action::Continue
     }
 }
-
-impl Context for HttpAuthRandom {
-    fn on_http_call_response(&mut self, _: u32, _: usize, body_size: usize, _: usize) {
-        if let Some(body) = self.get_http_call_response_body(0, body_size) {
-            if !body.is_empty() && body[0] % 2 == 0 {
-                trace!("Access granted.");
-                self.resume_http_request();
-                return;
-            }
-        }
-        trace!("Access forbidden.");
-        self.send_http_response(
-            403,
-            vec![("Powered-By", "proxy-wasm")],
-            Some(b"Access forbidden.\n"),
-        );
-    }
-}

examples/http_body.rs

@@ -24,18 +24,18 @@ pub fn _start() {
 struct HttpBody;
 struct HttpBodyRoot;
 
+impl Context for HttpBodyRoot {}
+
 impl RootContext for HttpBodyRoot {
     fn get_type(&self) -> ContextType {
         ContextType::HttpContext
     }
 
-    fn create_http_context(&self, _context_id: u32, _root_context_id: u32) -> Box<dyn HttpContext> {
+    fn create_http_context(&self, _context_id: u32) -> Box<dyn HttpContext> {
         Box::new(HttpBody)
     }
 }
 
-impl Context for HttpBodyRoot {}
-
 impl Context for HttpBody {}
 
 impl HttpContext for HttpBody {

examples/http_headers.rs

@@ -31,7 +31,7 @@ impl RootContext for HttpHeadersRoot {
         ContextType::HttpContext
     }
 
-    fn create_http_context(&self, _context_id: u32, _root_context_id: u32) -> Box<dyn HttpContext> {
+    fn create_http_context(&self, _context_id: u32) -> Box<dyn HttpContext> {
         Box::new(HttpHeaders {
             context_id: _context_id,
         })

src/dispatcher.rs

@@ -60,6 +60,17 @@ impl Dispatcher {
         self.new_root.set(Some(callback));
     }
 
+    fn register_callout(&self, token_id: u32) {
+        if self
+            .callouts
+            .borrow_mut()
+            .insert(token_id, self.active_id.get())
+            .is_some()
+        {
+            panic!("duplicate token_id")
+        }
+    }
+
     fn create_root_context(&self, context_id: u32) {
         let new_context = match self.new_root.get() {
             Some(f) => f(context_id),
@@ -77,7 +88,7 @@ impl Dispatcher {
 
     fn create_stream_context(&self, context_id: u32, root_context_id: u32) {
         let new_context = match self.roots.borrow().get(&root_context_id) {
-            Some(root_context) => root_context.create_stream_context(context_id, root_context_id),
+            Some(root_context) => root_context.create_stream_context(context_id),
             None => panic!("invalid root_context_id"),
         };
         if self
@@ -92,7 +103,7 @@ impl Dispatcher {
 
     fn create_http_context(&self, context_id: u32, root_context_id: u32) {
         let new_context = match self.roots.borrow().get(&root_context_id) {
-            Some(root_context) => root_context.create_http_context(context_id, root_context_id),
+            Some(root_context) => root_context.create_http_context(context_id),
             None => panic!("invalid root_context_id"),
         };
         if self
@@ -105,17 +116,6 @@ impl Dispatcher {
         }
     }
 
-    fn register_callout(&self, token_id: u32) {
-        if self
-            .callouts
-            .borrow_mut()
-            .insert(token_id, self.active_id.get())
-            .is_some()
-        {
-            panic!("duplicate token_id")
-        }
-    }
-
     fn on_create_context(&self, context_id: u32, root_context_id: u32) {
         if root_context_id == 0 {
             self.create_root_context(context_id);
@@ -125,10 +125,10 @@ impl Dispatcher {
                 ContextType::StreamContext => {
                     self.create_stream_context(context_id, root_context_id)
                 }
-                ContextType::RootContext => panic!("missing constructors"),
+                ContextType::RootContext => panic!("missing ContextType on root_context"),
             }
         } else {
-            panic!("missing constructors")
+            panic!("invalid root_context_id");
         }
     }
 

src/traits.rs

@@ -122,15 +122,11 @@ pub trait RootContext: Context {
 
     fn on_log(&mut self) {}
 
-    fn create_http_context(&self, _context_id: u32, _root_context_id: u32) -> Box<dyn HttpContext> {
+    fn create_http_context(&self, _context_id: u32) -> Box<dyn HttpContext> {
         Box::new(EmptyHttpContext)
     }
 
-    fn create_stream_context(
-        &self,
-        _context_id: u32,
-        _root_context_id: u32,
-    ) -> Box<dyn StreamContext> {
+    fn create_stream_context(&self, _context_id: u32) -> Box<dyn StreamContext> {
         Box::new(EmptyStreamContext)
     }
 
@@ -175,11 +171,6 @@ pub trait StreamContext: Context {
     fn on_log(&mut self) {}
 }
 
-struct EmptyHttpContext;
-
-impl HttpContext for EmptyHttpContext {}
-impl Context for EmptyHttpContext {}
-
 struct EmptyStreamContext;
 
 impl StreamContext for EmptyStreamContext {}
@@ -329,3 +320,8 @@ pub trait HttpContext: Context {
 
     fn on_log(&mut self) {}
 }
+
+struct EmptyHttpContext;
+
+impl HttpContext for EmptyHttpContext {}
+impl Context for EmptyHttpContext {}