Rename userdata to data (#3282)

* Rename userdata to data

Instead of saying "userdata", which is ambiguous and imprecise,
say "instruction data" or "account data".

Also, add `ProgramError::InvalidInstructionData`

Fixes #2761

wallet/src/wallet.rs

@@ -494,8 +494,8 @@ fn process_deploy(
             format!("Unable to open program file: {}", err).to_string(),
         )
     })?;
-    let mut program_userdata = Vec::new();
-    file.read_to_end(&mut program_userdata).map_err(|err| {
+    let mut program_data = Vec::new();
+    file.read_to_end(&mut program_data).map_err(|err| {
         WalletError::DynamicProgramError(
             format!("Unable to read program file: {}", err).to_string(),
         )
@@ -506,7 +506,7 @@ fn process_deploy(
         &program_id.pubkey(),
         blockhash,
         1,
-        program_userdata.len() as u64,
+        program_data.len() as u64,
         &bpf_loader::id(),
         0,
     );
@@ -516,7 +516,7 @@ fn process_deploy(
     })?;
 
     trace!("Writing program data");
-    let write_transactions: Vec<_> = program_userdata
+    let write_transactions: Vec<_> = program_data
         .chunks(USERDATA_CHUNK_SIZE)
         .zip(0..)
         .map(|(chunk, i)| {

wallet/tests/deploy.rs

@@ -70,11 +70,7 @@ fn test_wallet_deploy_program() {
     file.read_to_end(&mut elf).unwrap();
 
     assert_eq!(
-        account_info_obj
-            .get("userdata")
-            .unwrap()
-            .as_array()
-            .unwrap(),
+        account_info_obj.get("data").unwrap().as_array().unwrap(),
         &elf
     );