Keybase adapter merge issue fix (#2086)

* fix keybase adapter

* rustfmt
This commit is contained in:
Yeastplume 2018-12-05 19:05:13 +00:00 committed by GitHub
parent f9261310ab
commit e8a481e3d4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -15,8 +15,8 @@
// Keybase Wallet Plugin // Keybase Wallet Plugin
use controller; use controller;
use core::libtx::slate::Slate;
use failure::ResultExt; use failure::ResultExt;
use libtx::slate::Slate;
use libwallet::{Error, ErrorKind}; use libwallet::{Error, ErrorKind};
use serde::Serialize; use serde::Serialize;
use serde_json::{from_str, to_string, Value}; use serde_json::{from_str, to_string, Value};
@ -133,15 +133,15 @@ fn get_unread(topic: &str) -> HashMap<String, String> {
fn send<T: Serialize>(message: T, channel: &str, topic: &str, ttl: u16) -> bool { fn send<T: Serialize>(message: T, channel: &str, topic: &str, ttl: u16) -> bool {
let seconds = format!("{}s", ttl); let seconds = format!("{}s", ttl);
let payload = to_string(&json!({ let payload = to_string(&json!({
"method": "send", "method": "send",
"params": { "params": {
"options": { "options": {
"channel": { "channel": {
"name": channel, "topic_name": topic, "topic_type": "dev" "name": channel, "topic_name": topic, "topic_type": "dev"
}, },
"message": { "message": {
"body": to_string(&message).unwrap() "body": to_string(&message).unwrap()
}, },
"exploding_lifetime": seconds "exploding_lifetime": seconds
} }
} }