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 <[email protected]>

Author: dgn

examples/hello_world.rs

@@ -30,8 +30,6 @@ pub fn _start() {
 
 struct HelloWorld;
 
-impl Context for HelloWorld {}
-
 impl RootContext for HelloWorld {
     fn on_vm_start(&mut self, _: usize) -> bool {
         info!("Hello, World!");
@@ -54,3 +52,5 @@ impl RootContext for HelloWorld {
         }
     }
 }
+
+impl Context for HelloWorld {}

examples/http_auth_random.rs

@@ -31,7 +31,7 @@ impl RootContext for HttpAuthRandomRoot {
         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)
     }
 }

examples/http_body.rs

@@ -29,15 +29,13 @@ impl RootContext for HttpBodyRoot {
         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 {
     fn on_http_response_headers(&mut self, _: usize) -> Action {
         // If there is a Content-Length header and we change the length of
@@ -67,3 +65,5 @@ impl HttpContext for HttpBody {
         Action::Continue
     }
 }
+
+impl Context for HttpBody {}

examples/http_headers.rs

@@ -24,26 +24,24 @@ pub fn _start() {
 
 struct HttpHeadersRoot;
 
-impl Context for HttpHeadersRoot {}
-
 impl RootContext for HttpHeadersRoot {
     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(HttpHeaders {
             context_id: _context_id,
         })
     }
 }
 
+impl Context for HttpHeadersRoot {}
+
 struct HttpHeaders {
     context_id: u32,
 }
 
-impl Context for HttpHeaders {}
-
 impl HttpContext for HttpHeaders {
     fn on_http_request_headers(&mut self, _: usize) -> Action {
         for (name, value) in &self.get_http_request_headers() {
@@ -74,3 +72,5 @@ impl HttpContext for HttpHeaders {
         trace!("#{} completed.", self.context_id);
     }
 }
+
+impl Context for HttpHeaders {}

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 {}