From 32ffc7c8a7c5a472562376edd5427e3d619e8bb1 Mon Sep 17 00:00:00 2001
From: vms <michail.vms@gmail.com>
Date: Tue, 28 Jul 2020 23:57:22 +0300
Subject: [PATCH] fix fluence-faas dependecies

---
 Cargo.lock              | 106 ++--------------------------------------
 fluence-faas/Cargo.toml |   6 +--
 2 files changed, 8 insertions(+), 104 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 6955579d..fd7cbe2c 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -483,9 +483,9 @@ dependencies = [
  "serde_derive",
  "serde_json",
  "toml",
- "wasmer-runtime",
- "wasmer-runtime-core 0.17.0",
- "wasmer-wasi",
+ "wasmer-runtime-core-fl",
+ "wasmer-runtime-fl",
+ "wasmer-wasi-fl",
 ]
 
 [[package]]
@@ -1407,31 +1407,6 @@ dependencies = [
  "log",
 ]
 
-[[package]]
-name = "wasmer-clif-backend"
-version = "0.17.0"
-source = "git+https://github.com/fluencelabs/wasmer?branch=fluence#cdc9921023be726fca6967d0ed9af5b657aa6952"
-dependencies = [
- "byteorder",
- "cranelift-codegen",
- "cranelift-entity",
- "cranelift-native",
- "libc",
- "nix",
- "rayon",
- "serde",
- "serde-bench",
- "serde_bytes",
- "serde_derive",
- "target-lexicon",
- "wasmer-clif-fork-frontend",
- "wasmer-clif-fork-wasm",
- "wasmer-runtime-core 0.17.0",
- "wasmer-win-exception-handler 0.17.0",
- "wasmparser 0.51.4",
- "winapi",
-]
-
 [[package]]
 name = "wasmer-clif-backend-fl"
 version = "0.17.0"
@@ -1453,7 +1428,7 @@ dependencies = [
  "wasmer-clif-fork-frontend",
  "wasmer-clif-fork-wasm",
  "wasmer-runtime-core-fl",
- "wasmer-win-exception-handler 0.17.1",
+ "wasmer-win-exception-handler",
  "wasmparser 0.51.4",
  "winapi",
 ]
@@ -1497,47 +1472,6 @@ dependencies = [
  "wast",
 ]
 
-[[package]]
-name = "wasmer-runtime"
-version = "0.17.0"
-source = "git+https://github.com/fluencelabs/wasmer?branch=fluence#cdc9921023be726fca6967d0ed9af5b657aa6952"
-dependencies = [
- "lazy_static",
- "memmap",
- "serde",
- "serde_derive",
- "wasmer-clif-backend",
- "wasmer-runtime-core 0.17.0",
-]
-
-[[package]]
-name = "wasmer-runtime-core"
-version = "0.17.0"
-source = "git+https://github.com/fluencelabs/wasmer?branch=fluence#cdc9921023be726fca6967d0ed9af5b657aa6952"
-dependencies = [
- "bincode",
- "blake3",
- "cc",
- "digest 0.8.1",
- "errno",
- "hex",
- "indexmap",
- "lazy_static",
- "libc",
- "nix",
- "page_size",
- "parking_lot",
- "rustc_version",
- "serde",
- "serde-bench",
- "serde_bytes",
- "serde_derive",
- "smallvec",
- "target-lexicon",
- "wasmparser 0.51.4",
- "winapi",
-]
-
 [[package]]
 name = "wasmer-runtime-core"
 version = "0.17.1"
@@ -1610,25 +1544,6 @@ dependencies = [
  "wasmer-runtime-core-fl",
 ]
 
-[[package]]
-name = "wasmer-wasi"
-version = "0.17.0"
-source = "git+https://github.com/fluencelabs/wasmer?branch=fluence#cdc9921023be726fca6967d0ed9af5b657aa6952"
-dependencies = [
- "bincode",
- "byteorder",
- "generational-arena",
- "getrandom",
- "libc",
- "log",
- "serde",
- "thiserror",
- "time",
- "typetag",
- "wasmer-runtime-core 0.17.0",
- "winapi",
-]
-
 [[package]]
 name = "wasmer-wasi-fl"
 version = "0.17.0"
@@ -1649,17 +1564,6 @@ dependencies = [
  "winapi",
 ]
 
-[[package]]
-name = "wasmer-win-exception-handler"
-version = "0.17.0"
-source = "git+https://github.com/fluencelabs/wasmer?branch=fluence#cdc9921023be726fca6967d0ed9af5b657aa6952"
-dependencies = [
- "cc",
- "libc",
- "wasmer-runtime-core 0.17.0",
- "winapi",
-]
-
 [[package]]
 name = "wasmer-win-exception-handler"
 version = "0.17.1"
@@ -1668,7 +1572,7 @@ checksum = "1cd39f3b2bd7964b28ea6f944a7eaa445cfbc91c4f2695d188103f2689bb37d9"
 dependencies = [
  "cc",
  "libc",
- "wasmer-runtime-core 0.17.1",
+ "wasmer-runtime-core",
  "winapi",
 ]
 
diff --git a/fluence-faas/Cargo.toml b/fluence-faas/Cargo.toml
index fdaa8e01..1aef0957 100644
--- a/fluence-faas/Cargo.toml
+++ b/fluence-faas/Cargo.toml
@@ -7,10 +7,10 @@ edition = "2018"
 [dependencies]
 fce = { path = "../engine" }
 
-wasmer-runtime = { git = "https://github.com/fluencelabs/wasmer", branch = "fluence" }
+wasmer-runtime = { package = "wasmer-runtime-fl", version = "0.17.0" }
 # dynamicfunc-fat-closures allows using state inside DynamicFunc
-wasmer-core = { package = "wasmer-runtime-core", git = "http://github.com/fluencelabs/wasmer", branch = "fluence", features = ["dynamicfunc-fat-closures"] }
-wasmer-wasi = { git = "https://github.com/fluencelabs/wasmer", branch = "fluence" }
+wasmer-core = { package = "wasmer-runtime-core-fl", version = "0.17.0", features = ["dynamicfunc-fat-closures"] }
+wasmer-wasi = { package = "wasmer-wasi-fl", version = "0.17.0" }
 
 toml = "0.5.6"
 serde = { version = "1.0.111", features = ["derive"] }