Update core references in grin_store crate to grin_core (#3771)

* update core references in grin_store

* remove redundant as clause

store/src/leaf_set.rs

@@ -19,9 +19,9 @@ use std::path::{Path, PathBuf};
 
 use croaring::Bitmap;
 
-use crate::core::core::hash::Hashed;
-use crate::core::core::pmmr;
-use crate::core::core::BlockHeader;
+use crate::grin_core::core::hash::Hashed;
+use crate::grin_core::core::pmmr;
+use crate::grin_core::core::BlockHeader;
 use crate::prune_list::PruneList;
 use crate::{read_bitmap, save_via_temp_file};
 

store/src/lib.rs

@@ -23,7 +23,7 @@
 #[macro_use]
 extern crate log;
 #[macro_use]
-extern crate grin_core as core;
+extern crate grin_core;
 extern crate grin_util as util;
 
 //use grin_core as core;

store/src/lmdb.rs

@@ -21,8 +21,8 @@ use lmdb_zero as lmdb;
 use lmdb_zero::traits::CreateCursor;
 use lmdb_zero::LmdbResultExt;
 
-use crate::core::global;
-use crate::core::ser::{self, DeserializationMode, ProtocolVersion};
+use crate::grin_core::global;
+use crate::grin_core::ser::{self, DeserializationMode, ProtocolVersion};
 use crate::util::RwLock;
 
 /// number of bytes to grow the database by when needed

store/src/pmmr.rs

@@ -16,10 +16,10 @@
 use std::fs;
 use std::{io, time};
 
-use crate::core::core::hash::{Hash, Hashed};
-use crate::core::core::pmmr::{self, family, Backend};
-use crate::core::core::BlockHeader;
-use crate::core::ser::{PMMRable, ProtocolVersion};
+use crate::grin_core::core::hash::{Hash, Hashed};
+use crate::grin_core::core::pmmr::{self, family, Backend};
+use crate::grin_core::core::BlockHeader;
+use crate::grin_core::ser::{PMMRable, ProtocolVersion};
 use crate::leaf_set::LeafSet;
 use crate::prune_list::PruneList;
 use crate::types::{AppendOnlyFile, DataFile, SizeEntry, SizeInfo};

store/src/prune_list.rs

@@ -30,7 +30,7 @@ use std::{
 use croaring::Bitmap;
 use grin_core::core::pmmr;
 
-use crate::core::core::pmmr::{bintree_leftmost, bintree_postorder_height, family};
+use crate::grin_core::core::pmmr::{bintree_leftmost, bintree_postorder_height, family};
 use crate::{read_bitmap, save_via_temp_file};
 use std::cmp::min;
 

store/src/types.rs

@@ -14,7 +14,7 @@
 //! Common storage-related types
 use tempfile::tempfile;
 
-use crate::core::ser::{
+use crate::grin_core::ser::{
 	self, BinWriter, DeserializationMode, ProtocolVersion, Readable, Reader, StreamingReader,
 	Writeable, Writer,
 };