From 718c28725df4a254a2b8092573ae047c5e1e2760 Mon Sep 17 00:00:00 2001
From: Daniel Sanchez Quiros <sanchez.quiros.daniel@gmail.com>
Date: Tue, 29 Nov 2022 10:28:32 +0100
Subject: [PATCH] Refactor waku crate to waku-bindings

---
 Cargo.lock                        |  4 ++--
 examples/toy-chat/Cargo.toml      |  2 +-
 examples/toy-chat/src/main.rs     | 10 ++++++----
 examples/toy-chat/src/protocol.rs |  2 +-
 waku-bindings/Cargo.toml          |  2 +-
 waku-bindings/tests/node.rs       |  2 +-
 6 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index e603c3f..5b6f497 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1098,7 +1098,7 @@ dependencies = [
  "prost",
  "tui",
  "unicode-width",
- "waku",
+ "waku-bindings",
 ]
 
 [[package]]
@@ -1193,7 +1193,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
-name = "waku"
+name = "waku-bindings"
 version = "0.1.0-beta1"
 dependencies = [
  "aes-gcm",
diff --git a/examples/toy-chat/Cargo.toml b/examples/toy-chat/Cargo.toml
index acbbc68..f168b27 100644
--- a/examples/toy-chat/Cargo.toml
+++ b/examples/toy-chat/Cargo.toml
@@ -8,7 +8,7 @@ authors = [
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-waku = { path = "../../waku-bindings" }
+waku-bindings = { path = "../../waku-bindings" }
 tui = "0.19"
 crossterm = "0.25"
 unicode-width = "0.1"
diff --git a/examples/toy-chat/src/main.rs b/examples/toy-chat/src/main.rs
index 42906c0..904cdc4 100644
--- a/examples/toy-chat/src/main.rs
+++ b/examples/toy-chat/src/main.rs
@@ -22,7 +22,7 @@ use tui::{
     Frame, Terminal,
 };
 use unicode_width::UnicodeWidthStr;
-use waku::{
+use waku_bindings::{
     waku_new, waku_set_event_callback, ContentFilter, Multiaddr, PagingOptions, ProtocolId,
     Running, StoreQuery, WakuMessage, WakuNodeHandle,
 };
@@ -62,7 +62,9 @@ impl App {
         }
     }
 }
-fn retrieve_history(node_handle: &WakuNodeHandle<Running>) -> waku::Result<Vec<Chat2Message>> {
+fn retrieve_history(
+    node_handle: &WakuNodeHandle<Running>,
+) -> waku_bindings::Result<Vec<Chat2Message>> {
     let self_id = node_handle.peer_id().unwrap();
     let peer = node_handle
         .peers()?
@@ -130,7 +132,7 @@ fn main() -> std::result::Result<(), Box<dyn Error>> {
     }
     let shared_messages = Arc::clone(&app.messages);
     waku_set_event_callback(move |signal| match signal.event() {
-        waku::Event::WakuMessage(event) => {
+        waku_bindings::Event::WakuMessage(event) => {
             match <Chat2Message as Message>::decode(event.waku_message().payload()) {
                 Ok(chat_message) => {
                     shared_messages.write().unwrap().push(chat_message);
@@ -141,7 +143,7 @@ fn main() -> std::result::Result<(), Box<dyn Error>> {
                 }
             }
         }
-        waku::Event::Unrecognized(data) => {
+        waku_bindings::Event::Unrecognized(data) => {
             let mut out = std::io::stderr();
             write!(out, "Error, received unrecognized event {data}").unwrap();
         }
diff --git a/examples/toy-chat/src/protocol.rs b/examples/toy-chat/src/protocol.rs
index 110747e..4158f06 100644
--- a/examples/toy-chat/src/protocol.rs
+++ b/examples/toy-chat/src/protocol.rs
@@ -1,7 +1,7 @@
 use chrono::{DateTime, TimeZone, Utc};
 use once_cell::sync::Lazy;
 use prost::Message;
-use waku::{Encoding, WakuContentTopic};
+use waku_bindings::{Encoding, WakuContentTopic};
 
 pub static TOY_CHAT_CONTENT_TOPIC: Lazy<WakuContentTopic> = Lazy::new(|| WakuContentTopic {
     application_name: "toy-chat".into(),
diff --git a/waku-bindings/Cargo.toml b/waku-bindings/Cargo.toml
index 81baa8e..d6a9046 100644
--- a/waku-bindings/Cargo.toml
+++ b/waku-bindings/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "waku"
+name = "waku-bindings"
 version = "0.1.0-beta1"
 edition = "2021"
 authors = [
diff --git a/waku-bindings/tests/node.rs b/waku-bindings/tests/node.rs
index 19d2cd0..985481f 100644
--- a/waku-bindings/tests/node.rs
+++ b/waku-bindings/tests/node.rs
@@ -5,7 +5,7 @@ use secp256k1::{PublicKey, Secp256k1, SecretKey};
 use std::net::IpAddr;
 use std::str::FromStr;
 use std::time::{Duration, SystemTime};
-use waku::{
+use waku_bindings::{
     waku_new, waku_set_event_callback, Encoding, Event, ProtocolId, WakuContentTopic, WakuLogLevel,
     WakuMessage, WakuNodeConfig,
 };