last fixes

Cargo.toml

@@ -29,6 +29,6 @@ thiserror = "1.0"
 ethers = { version = "2.0.11", features = ["abigen"] }
 ctor = "0.2"
 lib-didethresolver = { git = "https://github.com/xmtp/didethresolver", branch = "main" }
-gateway-types = { path = "./gateway-types" }
+xps-types = { path = "./xps-types" }
 rustc-hex = "2.1"
 hex = "0.4"

lib-xps/Cargo.toml

@@ -19,7 +19,7 @@ thiserror.workspace = true
 ethers = { workspace = true, features = ["ws"] }
 ctor.workspace = true
 lib-didethresolver.workspace = true
-gateway-types.workspace = true
+xps-types.workspace = true
 hex.workspace = true
 rand = "0.8.5"
 tokio-stream = { version = "0.1", features = ["net"] }

lib-xps/tests/integration_test.rs

@@ -10,7 +10,7 @@ use lib_didethresolver::{
     did_registry::RegistrySignerExt,
     types::{DidUrl, KeyEncoding, XmtpAttribute, XmtpKeyPurpose, NULL_ADDRESS},
 };
-use xps_gateway::rpc::*;
+use lib_xps::rpc::*;
 
 use ethers::types::{Address, U256};
 use xps_types::{Message, Status};

lib-xps/tests/integration_util/mod.rs

@@ -27,7 +27,7 @@ use std::{
 use tokio::time::timeout as timeout_tokio;
 use tracing_subscriber::{fmt, layer::SubscriberExt, util::SubscriberInitExt, EnvFilter, Registry};
 
-use xps_gateway::{
+use lib_xps::{
     types::{GatewayContext, GatewaySigner},
     XpsMethods, XpsServer,
 };

xps-types/Cargo.toml

@@ -1,5 +1,5 @@
 [package]
-name = "gateway-types"
+name = "xps-types"
 version = "0.1.0"
 edition = "2021"
 

xps/Cargo.toml

@@ -6,6 +6,7 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-lib-xps = { path = "../lib-xps" }
 anyhow.workspace = true
+tokio.workspace = true
+lib-xps = { path = "../lib-xps" }
 clap = { version = "4.4.18", features = ["derive"] }