Skip to content

Commit

Permalink
Merge branch 'master' into miraclx/revamp-store
Browse files Browse the repository at this point in the history
  • Loading branch information
miraclx committed Jun 24, 2024
2 parents 5083a3d + 0f0b644 commit 165cc57
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 6 deletions.
3 changes: 2 additions & 1 deletion crates/network/src/stream/codec.rs
Original file line number Diff line number Diff line change
Expand Up @@ -49,11 +49,12 @@ impl Encoder<Message> for MessageJsonCodec {

#[cfg(test)]
mod tests {
use super::*;
use futures_util::StreamExt;
use tokio_test::io::Builder;
use tokio_util::codec::FramedRead;

use super::*;

#[test]
fn test_my_frame_encoding_decoding() {
let request = Message {
Expand Down
3 changes: 1 addition & 2 deletions crates/sdk/src/env/ext.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
use crate::sys;

use super::{expected_boolean, expected_register, panic_str, read_register, DATA_REGISTER};
use crate::sys;

#[doc(hidden)]
pub unsafe fn fetch(
Expand Down
2 changes: 1 addition & 1 deletion crates/server/src/admin/handlers/add_client_key.rs
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ pub fn store_client_key(
wallet_type: WalletType::NEAR,
signing_key: req.payload.message.public_key.clone(),
created_at: Utc::now().timestamp_millis() as u64,
context_id: req.context_id.clone()
context_id: req.context_id.clone(),
};
add_client_key(&store, client_key).map_err(|e| parse_api_error(e))?;
info!("Client key stored successfully.");
Expand Down
3 changes: 1 addition & 2 deletions crates/server/src/admin/service.rs
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,8 @@ use serde_json::json;
use tower_sessions::{MemoryStore, SessionManagerLayer};
use tracing::info;

use crate::middleware;

use super::handlers;
use crate::middleware;

#[derive(Debug, Serialize, Deserialize)]
pub struct AdminConfig {
Expand Down

0 comments on commit 165cc57

Please sign in to comment.