fix: integration Cargo.toml (mimblewimble#17)

* fix: integration Cargo.toml * rustfmt
garyyu · May 5, 2019 · eaafd0c · eaafd0c
1 parent 8934180
commit eaafd0c
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 39 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/integration/Cargo.toml b/integration/Cargo.toml
@@ -24,16 +24,15 @@ tokio =  "0.1.11"
 blake2-rfc = "0.2"
 bufstream = "0.1"
 
-grin_apiwallet = { path = "../apiwallet", version = "1.1.0" }
-grin_libwallet = { path = "../libwallet", version = "1.1.0" }
-grin_refwallet = { path = "../refwallet", version = "1.1.0" }
-grin_wallet_config = { path = "../config", version = "1.1.0" }
+grin_wallet_api = { path = "../api", version = "1.1.0-beta.2" }
+grin_wallet_libwallet = { path = "../libwallet", version = "1.1.0-beta.2" }
+grin_wallet_config = { path = "../config", version = "1.1.0-beta.2" }
 
-grin_core = { git = "https://github.com/mimblewimble/grin", branch = "milestone/1.1.0" }
-grin_keychain = { git = "https://github.com/mimblewimble/grin", branch = "milestone/1.1.0" }
-grin_chain = { git = "https://github.com/mimblewimble/grin", branch = "milestone/1.1.0" }
-grin_util = { git = "https://github.com/mimblewimble/grin", branch = "milestone/1.1.0" }
-grin_api = { git = "https://github.com/mimblewimble/grin", branch = "milestone/1.1.0" }
-grin_store = { git = "https://github.com/mimblewimble/grin", branch = "milestone/1.1.0" }
-grin_p2p = { git = "https://github.com/mimblewimble/grin", branch = "milestone/1.1.0" }
-grin_servers = { git = "https://github.com/mimblewimble/grin", branch = "milestone/1.1.0" }
+grin_core = { git = "https://github.com/mimblewimble/grin", branch = "master" }
+grin_keychain = { git = "https://github.com/mimblewimble/grin", branch = "master" }
+grin_chain = { git = "https://github.com/mimblewimble/grin", branch = "master" }
+grin_util = { git = "https://github.com/mimblewimble/grin", branch = "master" }
+grin_api = { git = "https://github.com/mimblewimble/grin", branch = "master" }
+grin_store = { git = "https://github.com/mimblewimble/grin", branch = "master" }
+grin_p2p = { git = "https://github.com/mimblewimble/grin", branch = "master" }
+grin_servers = { git = "https://github.com/mimblewimble/grin", branch = "master" }
diff --git a/integration/tests/framework.rs b/integration/tests/framework.rs
@@ -12,10 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-extern crate grin_apiwallet as apiwallet;
-extern crate grin_libwallet as libwallet;
-extern crate grin_refwallet as wallet;
+extern crate grin_wallet_api as apiwallet;
 extern crate grin_wallet_config as wallet_config;
+extern crate grin_wallet_libwallet as libwallet;
 
 use self::keychain::Keychain;
 use self::util::Mutex;

diff --git a/integration/tests/simulnet.rs b/integration/tests/simulnet.rs
@@ -12,10 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-extern crate grin_apiwallet as apiwallet;
-extern crate grin_libwallet as libwallet;
-extern crate grin_refwallet as wallet;
+extern crate grin_wallet_api as apiwallet;
 extern crate grin_wallet_config as wallet_config;
+extern crate grin_wallet_libwallet as libwallet;
 #[macro_use]
 extern crate log;