Rewrite as an object

1 files changed, 12 insertions, 11 deletions

diff --git a/src/diplonat.rs b/src/diplonat.rs
index c209da5..3dd4e91 100644
--- a/src/diplonat.rs
+++ b/src/diplonat.rs
@@ -1,21 +1,22 @@
 use anyhow::{Result, Context};
-use log::*;
 use crate::*;
 
-pub struct DiplonatContext {
+pub struct Diplonat {
   pub config: config::DiplonatConfig,
   pub gateway: igd::aio::Gateway
 }
 
-pub async fn setup() -> Result<DiplonatContext> {
-  let ctx = DiplonatContext {
-    config: config::load_env().context("Unable to read configuration from environment")?,
-    gateway: gw::get_gateway().await? 
-  };
+impl Diplonat {
+  pub async fn new() -> Result<Self> {
+    let ctx = Self {
+      config: config::load_env().context("Unable to read configuration from environment")?,
+      gateway: gw::get_gateway().await? 
+    };
 
-  return Ok(ctx);
-}
+    return Ok(ctx);
+  }
 
-pub fn listen() -> bool {
-  return true;
+  pub fn listen(&self) -> bool {
+    return true;
+  }
 }