Core/grin
0
0
Fork 0
mirror of https://github.com/mimblewimble/grin.git synced 2025-04-30 06:11:14 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

commit cargo.lock ()

Browse source 
* commit cargo.lock

* rustfmt
This commit is contained in:
Gary Yu 2019-06-06 11:34:34 +08:00 • committed by GitHub
parent 5ebe2aa397
commit d03a81f55c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 61 additions and 62 deletions

114
Cargo.lock generated
View file

@ -655,7 +655,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "grin"
version = "1.1.0"
version = "1.1.1-beta.1"
dependencies = [
"blake2-rfc 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)",
"built 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
@ -665,15 +665,15 @@ dependencies = [
"cursive 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
"failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
"failure_derive 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
"grin_api 1.1.0",
"grin_chain 1.1.0",
"grin_config 1.1.0",
"grin_core 1.1.0",
"grin_keychain 1.1.0",
"grin_p2p 1.1.0",
"grin_servers 1.1.0",
"grin_store 1.1.0",
"grin_util 1.1.0",
"grin_api 1.1.1-beta.1",
"grin_chain 1.1.1-beta.1",
"grin_config 1.1.1-beta.1",
"grin_core 1.1.1-beta.1",
"grin_keychain 1.1.1-beta.1",
"grin_p2p 1.1.1-beta.1",
"grin_servers 1.1.1-beta.1",
"grin_store 1.1.1-beta.1",
"grin_util 1.1.1-beta.1",
"humansize 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
"pancurses 0.16.1 (registry+https://github.com/rust-lang/crates.io-index)",
@ -684,17 +684,17 @@ dependencies = [
[[package]]
name = "grin_api"
version = "1.1.0"
version = "1.1.1-beta.1"
dependencies = [
"failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
"failure_derive 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
"futures 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)",
"grin_chain 1.1.0",
"grin_core 1.1.0",
"grin_p2p 1.1.0",
"grin_pool 1.1.0",
"grin_store 1.1.0",
"grin_util 1.1.0",
"grin_chain 1.1.1-beta.1",
"grin_core 1.1.1-beta.1",
"grin_p2p 1.1.1-beta.1",
"grin_pool 1.1.1-beta.1",
"grin_store 1.1.1-beta.1",
"grin_util 1.1.1-beta.1",
"http 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)",
"hyper 0.12.27 (registry+https://github.com/rust-lang/crates.io-index)",
"hyper-rustls 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)",
@ -715,7 +715,7 @@ dependencies = [
[[package]]
name = "grin_chain"
version = "1.1.0"
version = "1.1.1-beta.1"
dependencies = [
"bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
"byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
@ -724,10 +724,10 @@ dependencies = [
"env_logger 0.5.13 (registry+https://github.com/rust-lang/crates.io-index)",
"failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
"failure_derive 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
"grin_core 1.1.0",
"grin_keychain 1.1.0",
"grin_store 1.1.0",
"grin_util 1.1.0",
"grin_core 1.1.1-beta.1",
"grin_keychain 1.1.1-beta.1",
"grin_store 1.1.1-beta.1",
"grin_util 1.1.1-beta.1",
"lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
"lru-cache 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
@ -739,13 +739,13 @@ dependencies = [
[[package]]
name = "grin_config"
version = "1.1.0"
version = "1.1.1-beta.1"
dependencies = [
"dirs 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
"grin_core 1.1.0",
"grin_p2p 1.1.0",
"grin_servers 1.1.0",
"grin_util 1.1.0",
"grin_core 1.1.1-beta.1",
"grin_p2p 1.1.1-beta.1",
"grin_servers 1.1.1-beta.1",
"grin_util 1.1.1-beta.1",
"pretty_assertions 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
"rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 1.0.90 (registry+https://github.com/rust-lang/crates.io-index)",
@ -755,7 +755,7 @@ dependencies = [
[[package]]
name = "grin_core"
version = "1.1.0"
version = "1.1.1-beta.1"
dependencies = [
"blake2-rfc 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)",
"byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
@ -764,8 +764,8 @@ dependencies = [
"enum_primitive 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
"failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
"failure_derive 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
"grin_keychain 1.1.0",
"grin_util 1.1.0",
"grin_keychain 1.1.1-beta.1",
"grin_util 1.1.1-beta.1",
"lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
"lru-cache 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
@ -781,12 +781,12 @@ dependencies = [
[[package]]
name = "grin_keychain"
version = "1.1.0"
version = "1.1.1-beta.1"
dependencies = [
"blake2-rfc 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)",
"byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
"digest 0.7.6 (registry+https://github.com/rust-lang/crates.io-index)",
"grin_util 1.1.0",
"grin_util 1.1.1-beta.1",
"hmac 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)",
"lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
@ -803,17 +803,17 @@ dependencies = [
[[package]]
name = "grin_p2p"
version = "1.1.0"
version = "1.1.1-beta.1"
dependencies = [
"bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
"bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
"chrono 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
"enum_primitive 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
"grin_chain 1.1.0",
"grin_core 1.1.0",
"grin_pool 1.1.0",
"grin_store 1.1.0",
"grin_util 1.1.0",
"grin_chain 1.1.1-beta.1",
"grin_core 1.1.1-beta.1",
"grin_pool 1.1.1-beta.1",
"grin_store 1.1.1-beta.1",
"grin_util 1.1.1-beta.1",
"log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
"net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)",
"num 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
@ -825,17 +825,17 @@ dependencies = [
[[package]]
name = "grin_pool"
version = "1.1.0"
version = "1.1.1-beta.1"
dependencies = [
"blake2-rfc 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)",
"chrono 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
"failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
"failure_derive 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
"grin_chain 1.1.0",
"grin_core 1.1.0",
"grin_keychain 1.1.0",
"grin_store 1.1.0",
"grin_util 1.1.0",
"grin_chain 1.1.1-beta.1",
"grin_core 1.1.1-beta.1",
"grin_keychain 1.1.1-beta.1",
"grin_store 1.1.1-beta.1",
"grin_util 1.1.1-beta.1",
"log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
"rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 1.0.90 (registry+https://github.com/rust-lang/crates.io-index)",
@ -858,19 +858,19 @@ dependencies = [
[[package]]
name = "grin_servers"
version = "1.1.0"
version = "1.1.1-beta.1"
dependencies = [
"chrono 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
"fs2 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
"futures 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)",
"grin_api 1.1.0",
"grin_chain 1.1.0",
"grin_core 1.1.0",
"grin_keychain 1.1.0",
"grin_p2p 1.1.0",
"grin_pool 1.1.0",
"grin_store 1.1.0",
"grin_util 1.1.0",
"grin_api 1.1.1-beta.1",
"grin_chain 1.1.1-beta.1",
"grin_core 1.1.1-beta.1",
"grin_keychain 1.1.1-beta.1",
"grin_p2p 1.1.1-beta.1",
"grin_pool 1.1.1-beta.1",
"grin_store 1.1.1-beta.1",
"grin_util 1.1.1-beta.1",
"http 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)",
"hyper 0.12.27 (registry+https://github.com/rust-lang/crates.io-index)",
"hyper-rustls 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)",
@ -886,7 +886,7 @@ dependencies = [
[[package]]
name = "grin_store"
version = "1.1.0"
version = "1.1.1-beta.1"
dependencies = [
"byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
"chrono 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
@ -895,8 +895,8 @@ dependencies = [
"failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
"failure_derive 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
"filetime 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
"grin_core 1.1.0",
"grin_util 1.1.0",
"grin_core 1.1.1-beta.1",
"grin_util 1.1.1-beta.1",
"libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)",
"lmdb-zero 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
@ -909,7 +909,7 @@ dependencies = [
[[package]]
name = "grin_util"
version = "1.1.0"
version = "1.1.1-beta.1"
dependencies = [
"backtrace 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)",
"base64 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)",

9
p2p/src/protocol.rs
View file

@ -12,7 +12,6 @@
// See the License for the specific language governing permissions and
// limitations under the License.
use crate::conn::{Message, MessageHandler, Response, Tracker};
use crate::core::core::{self, hash::Hash, hash::Hashed, CompactBlock};
@ -294,13 +293,13 @@ impl MessageHandler for Protocol {
Type::TxHashSetRequest => {
let sm_req: TxHashSetRequest = msg.body()?;
debug!(
"handle_payload: txhashset req for {} at {}",
sm_req.hash, sm_req.height
);
let txhashset_header = self.adapter.txhashset_archive_header()?;
let txhashset_header_hash = txhashset_header.hash();
debug!(
"handle_payload: txhashset request for {} at {}, response with {} at {}",
sm_req.hash, sm_req.height, txhashset_header.height, txhashset_header_hash,
);
let txhashset = self.adapter.txhashset_read(txhashset_header_hash);
if let Some(txhashset) = txhashset {