Use forked borsh

Cargo.toml

@@ -23,4 +23,4 @@ opt-level = 3
 [patch.crates-io]
 oasis-std = { path = "oasis-std" }
 oasis-test = { path = "oasis-test" }
-borsh = { git = "https://github.com/nhynes/borsh" }
+borsh = { git = "https://github.com/oasislabs/borsh" }

oasis-std/src/client.rs

@@ -1,13 +1,11 @@
 use oasis_types::Address;
 
 pub trait Gateway {
-    type Error;
-
     /// Deploys a new service with the provided initcode.
     /// `initcode` is expected to be the Wasm bytecode concatenated with the the constructor stdin.
     /// Upon success, returns the address of the new service.
-    fn deploy(&self, initcode: &[u8]) -> Result<Address, Self::Error>;
+    fn deploy(&self, initcode: &[u8]) -> Result<Address, Box<dyn std::error::Error>>;
 
     /// Returns the output of calling the service at `address` with `data` as stdin.
-    fn rpc(&self, address: Address, data: &[u8]) -> Result<Vec<u8>, Self::Error>;
+    fn rpc(&self, address: Address, data: &[u8]) -> Result<Vec<u8>, Box<dyn std::error::Error>>;
 }

tests/Cargo.toml

@@ -10,4 +10,4 @@ lto = true
 opt-level = 3
 
 [patch.crates-io]
-borsh = { git = "https://github.com/nhynes/borsh" }
+borsh = { git = "https://github.com/oasislabs/borsh" }