Remove MessageInfo argument from migrate entry point

Building.md

@@ -26,7 +26,7 @@ making real code.
 You must support the rust target `wasm32-unknown-unknown`.
 
 Check which ones you currently have installed via
-`rustup target list --installed`. If wasm32 is not on that list, install using
+`rustup target listfix conflicts and then com --installed`. If wasm32 is not on that list, install using
 `rustup target add wasm32-unknown-unknown`
 
 ## Building

contracts/burner/src/contract.rs

@@ -30,12 +30,7 @@ pub fn handle(
 }
 
 #[entry_point]
-pub fn migrate(
-    deps: DepsMut,
-    env: Env,
-    _info: MessageInfo,
-    msg: MigrateMsg,
-) -> StdResult<MigrateResponse> {
+pub fn migrate(deps: DepsMut, env: Env, msg: MigrateMsg) -> StdResult<MigrateResponse> {
     // delete all state
     let keys: Vec<_> = deps
         .storage
@@ -101,8 +96,7 @@ mod tests {
         let msg = MigrateMsg {
             payout: payout.clone(),
         };
-        let info = mock_info("creator", &[]);
-        let res = migrate(deps.as_mut(), mock_env(), info, msg).unwrap();
+        let res = migrate(deps.as_mut(), mock_env(), msg).unwrap();
         // check payout
         assert_eq!(1, res.messages.len());
         let msg = res.messages.get(0).expect("no message");

contracts/burner/tests/integration.rs

@@ -66,8 +66,7 @@ fn migrate_cleans_up_data() {
     let msg = MigrateMsg {
         payout: payout.clone(),
     };
-    let info = mock_info("creator", &[]);
-    let res: MigrateResponse = migrate(&mut deps, mock_env(), info, msg).unwrap();
+    let res: MigrateResponse = migrate(&mut deps, mock_env(), msg).unwrap();
     // check payout
     assert_eq!(1, res.messages.len());
     let msg = res.messages.get(0).expect("no message");

contracts/hackatom/src/contract.rs

@@ -111,12 +111,7 @@ pub fn init(
     Ok(ctx.try_into()?)
 }
 
-pub fn migrate(
-    deps: DepsMut,
-    _env: Env,
-    _info: MessageInfo,
-    msg: MigrateMsg,
-) -> Result<MigrateResponse, HackError> {
+pub fn migrate(deps: DepsMut, _env: Env, msg: MigrateMsg) -> Result<MigrateResponse, HackError> {
     let data = deps
         .storage
         .get(CONFIG_KEY)
@@ -431,8 +426,7 @@ mod tests {
         let msg = MigrateMsg {
             verifier: new_verifier.clone(),
         };
-        let info = mock_info(creator.as_str(), &[]);
-        let res = migrate(deps.as_mut(), mock_env(), info, msg).unwrap();
+        let res = migrate(deps.as_mut(), mock_env(), msg).unwrap();
         assert_eq!(0, res.messages.len());
 
         // check it is 'someone else'

contracts/hackatom/tests/integration.rs

@@ -134,8 +134,7 @@ fn migrate_verifier() {
     let msg = MigrateMsg {
         verifier: HumanAddr::from("someone else"),
     };
-    let info = mock_info(creator.as_str(), &[]);
-    let res: MigrateResponse = migrate(&mut deps, mock_env(), info, msg).unwrap();
+    let res: MigrateResponse = migrate(&mut deps, mock_env(), msg).unwrap();
     assert_eq!(0, res.messages.len());
 
     // check it is 'someone else'

contracts/queue/src/contract.rs

@@ -125,12 +125,7 @@ fn handle_dequeue(deps: DepsMut) -> StdResult<HandleResponse> {
 }
 
 #[cfg_attr(not(feature = "library"), entry_point)]
-pub fn migrate(
-    deps: DepsMut,
-    _env: Env,
-    _info: MessageInfo,
-    _msg: MigrateMsg,
-) -> StdResult<MigrateResponse> {
+pub fn migrate(deps: DepsMut, _env: Env, _msg: MigrateMsg) -> StdResult<MigrateResponse> {
     // clear all
     let keys: Vec<_> = deps
         .storage

contracts/queue/tests/integration.rs

@@ -195,8 +195,7 @@ fn migrate_works() {
     assert_eq!(get_sum(&mut deps), 25 + 17);
 
     let msg = MigrateMsg {};
-    let info = mock_info("admin", &[]);
-    let res: MigrateResponse = migrate(&mut deps, mock_env(), info, msg).unwrap();
+    let res: MigrateResponse = migrate(&mut deps, mock_env(), msg).unwrap();
     assert_eq!(res.messages.len(), 0);
 
     assert_eq!(get_count(&mut deps), 3);

packages/std/src/entry_points.rs

@@ -52,8 +52,8 @@
 macro_rules! create_entry_points {
     (@migration; $contract:ident, true) => {
         #[no_mangle]
-        extern "C" fn migrate(env_ptr: u32, info_ptr: u32, msg_ptr: u32) -> u32 {
-            do_migrate(&$contract::migrate, env_ptr, info_ptr, msg_ptr)
+        extern "C" fn migrate(env_ptr: u32, msg_ptr: u32) -> u32 {
+            do_migrate(&$contract::migrate, env_ptr, msg_ptr)
         }
     };
 
@@ -99,8 +99,7 @@ macro_rules! create_entry_points {
 /// # type MigrateMsg = ();
 /// pub fn migrate(
 ///     deps: DepsMut,
-///     env: Env,
-///     info: MessageInfo,
+///     _env: Env,
 ///     msg: MigrateMsg,
 /// ) -> Result<MigrateResponse, StdError> {
 /// #   Ok(Default::default())

packages/std/src/exports.rs

@@ -124,22 +124,16 @@ where
 /// - `C`: custom response message type (see CosmosMsg)
 /// - `E`: error type for responses
 pub fn do_migrate<M, C, E>(
-    migrate_fn: &dyn Fn(DepsMut, Env, MessageInfo, M) -> Result<MigrateResponse<C>, E>,
+    migrate_fn: &dyn Fn(DepsMut, Env, M) -> Result<MigrateResponse<C>, E>,
     env_ptr: u32,
-    info_ptr: u32,
     msg_ptr: u32,
 ) -> u32
 where
     M: DeserializeOwned + JsonSchema,
     C: Serialize + Clone + fmt::Debug + PartialEq + JsonSchema,
     E: ToString,
 {
-    let res = _do_migrate(
-        migrate_fn,
-        env_ptr as *mut Region,
-        info_ptr as *mut Region,
-        msg_ptr as *mut Region,
-    );
+    let res = _do_migrate(migrate_fn, env_ptr as *mut Region, msg_ptr as *mut Region);
     let v = to_vec(&res).unwrap();
     release_buffer(v) as u32
 }
@@ -209,9 +203,8 @@ where
 }
 
 fn _do_migrate<M, C, E>(
-    migrate_fn: &dyn Fn(DepsMut, Env, MessageInfo, M) -> Result<MigrateResponse<C>, E>,
+    migrate_fn: &dyn Fn(DepsMut, Env, M) -> Result<MigrateResponse<C>, E>,
     env_ptr: *mut Region,
-    info_ptr: *mut Region,
     msg_ptr: *mut Region,
 ) -> ContractResult<MigrateResponse<C>>
 where
@@ -220,15 +213,13 @@ where
     E: ToString,
 {
     let env: Vec<u8> = unsafe { consume_region(env_ptr) };
-    let info: Vec<u8> = unsafe { consume_region(info_ptr) };
     let msg: Vec<u8> = unsafe { consume_region(msg_ptr) };
 
     let env: Env = try_into_contract_result!(from_slice(&env));
-    let info: MessageInfo = try_into_contract_result!(from_slice(&info));
     let msg: M = try_into_contract_result!(from_slice(&msg));
 
     let mut deps = make_dependencies();
-    migrate_fn(deps.as_mut(), env, info, msg).into()
+    migrate_fn(deps.as_mut(), env, msg).into()
 }
 
 fn _do_query<M, E>(

packages/vm/src/calls.rs

@@ -59,7 +59,6 @@ where
 pub fn call_migrate<A, S, Q, U>(
     instance: &mut Instance<A, S, Q>,
     env: &Env,
-    info: &MessageInfo,
     msg: &[u8],
 ) -> VmResult<ContractResult<MigrateResponse<U>>>
 where
@@ -69,8 +68,7 @@ where
     U: DeserializeOwned + Clone + fmt::Debug + JsonSchema + PartialEq,
 {
     let env = to_vec(env)?;
-    let info = to_vec(info)?;
-    let data = call_migrate_raw(instance, &env, &info, msg)?;
+    let data = call_migrate_raw(instance, &env, msg)?;
     let result: ContractResult<MigrateResponse<U>> = from_slice(&data)?;
     Ok(result)
 }
@@ -138,7 +136,6 @@ where
 pub fn call_migrate_raw<A, S, Q>(
     instance: &mut Instance<A, S, Q>,
     env: &[u8],
-    info: &[u8],
     msg: &[u8],
 ) -> VmResult<Vec<u8>>
 where
@@ -147,7 +144,7 @@ where
     Q: Querier + 'static,
 {
     instance.set_storage_readonly(false);
-    call_raw(instance, "migrate", &[env, info, msg], MAX_LENGTH_MIGRATE)
+    call_raw(instance, "migrate", &[env, msg], MAX_LENGTH_MIGRATE)
 }
 
 /// Calls Wasm export "query" and returns raw data from the contract.

packages/vm/src/testing/calls.rs

@@ -60,7 +60,6 @@ where
 pub fn migrate<A, S, Q, M, U>(
     instance: &mut Instance<A, S, Q>,
     env: Env,
-    info: MessageInfo,
     msg: M,
 ) -> ContractResult<MigrateResponse<U>>
 where
@@ -71,7 +70,7 @@ where
     U: DeserializeOwned + Clone + PartialEq + JsonSchema + fmt::Debug,
 {
     let serialized_msg = to_vec(&msg).expect("Testing error: Could not seralize request message");
-    call_migrate(instance, &env, &info, &serialized_msg).expect("VM error")
+    call_migrate(instance, &env, &serialized_msg).expect("VM error")
 }
 
 // query mimicks the call signature of the smart contracts.