Skip to content

Commit

Permalink
Merge 2bd161b into fc4f616
Browse files Browse the repository at this point in the history
  • Loading branch information
nkysg authored Jun 27, 2022
2 parents fc4f616 + 2bd161b commit ae0418c
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 18 deletions.
27 changes: 14 additions & 13 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions cmd/faucet/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@ edition = "2021"

[dependencies]
anyhow = "1.0.41"
tiny_http = "0.6"
tiny_http = "0.8.2"
futures = "0.3.12"
hex = { version = "0.4.3", default-features = false }
tokio = {version = "^1", features = ["full"] }
tokio-executor = { version = "0.2.0-alpha.6", features = ["blocking"] }
futures-timer = "3.0"
ascii = "0.8"
rust-embed = "5.9.0"
ascii = "1.0.0"
rust-embed = "6.3.0"
serde = { version = "1.0.130" }
serde_json = { version="1.0", features = ["arbitrary_precision"]}
once_cell = "1.12.0"
Expand Down
2 changes: 1 addition & 1 deletion cmd/faucet/src/web.rs
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ struct Asset;

fn index_html() -> String {
let index_html = Asset::get("index.html").unwrap();
std::str::from_utf8(index_html.as_ref())
std::str::from_utf8(index_html.data.as_ref())
.unwrap()
.to_string()
}
Expand Down
2 changes: 1 addition & 1 deletion commons/metrics/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ description = "Starcoin metrics"
[dependencies]
anyhow = "1.0.41"
futures = "0.3.12"
hyper = { version = "0.14", features = ["full"]}
hyper = { version = "0.14.12", features = ["full"]}
starcoin-logger = { path = "../logger" }
prometheus = { version = "0.13.0", default-features = false, features =["push"] }
serde_json = { version="1.0", features = ["arbitrary_precision"]}
Expand Down

0 comments on commit ae0418c

Please sign in to comment.