Revert "[move] Enable serialization of source maps into json (#18727)"

This reverts commit 65e9b4a.

external-crates/move/Cargo.toml

@@ -139,7 +139,6 @@ module-generation = { path = "crates/module-generation" }
 move-abstract-interpreter = { path = "crates/move-abstract-interpreter" }
 move-abstract-stack = { path = "crates/move-abstract-stack" }
 move-binary-format = { path = "crates/move-binary-format" }
-move-trace-format = { path = "crates/move-trace-format" }
 move-borrow-graph = { path = "crates/move-borrow-graph" }
 move-bytecode-source-map = { path = "crates/move-bytecode-source-map" }
 move-bytecode-utils = { path = "crates/move-bytecode-utils" }

external-crates/move/crates/move-binary-format/src/file_format_common.rs

@@ -529,10 +529,11 @@ pub const VERSION_MAX: u32 = VERSION_7;
 // TODO(#145): finish v4 compatibility; as of now, only metadata is implemented
 pub const VERSION_MIN: u32 = VERSION_5;
 
-/// The corresponding opcode for each bytecode (disregards the argument).
-pub fn instruction_opcode(instruction: &Bytecode) -> Opcodes {
+/// The encoding of the instruction is the serialized form of it, but disregarding the
+/// serialization of the instruction's argument(s).
+pub fn instruction_key(instruction: &Bytecode) -> u8 {
  use Bytecode::*;
- match instruction {
+ let opcode = match instruction {
  Pop => Opcodes::POP,
  Ret => Opcodes::RET,
  BrTrue(_) => Opcodes::BR_TRUE,
@@ -620,11 +621,6 @@ pub fn instruction_opcode(instruction: &Bytecode) -> Opcodes {
  MutBorrowGlobalGenericDeprecated(_) => Opcodes::MUT_BORROW_GLOBAL_GENERIC_DEPRECATED,
  ImmBorrowGlobalDeprecated(_) => Opcodes::IMM_BORROW_GLOBAL_DEPRECATED,
  ImmBorrowGlobalGenericDeprecated(_) => Opcodes::IMM_BORROW_GLOBAL_GENERIC_DEPRECATED,
- }
-}
-
-/// The encoding of the instruction is the serialized form of it, but disregarding the
-/// serialization of the instruction's argument(s).
-pub fn instruction_key(instruction: &Bytecode) -> u8 {
- instruction_opcode(instruction) as u8
+ };
+ opcode as u8
 }

external-crates/move/crates/move-bytecode-source-map/Cargo.toml

@@ -17,7 +17,6 @@ move-command-line-common.workspace = true
 bcs.workspace = true
 
 serde.workspace = true
-serde_json.workspace = true
 
 [features]
 default = []

external-crates/move/crates/move-bytecode-source-map/src/utils.rs

@@ -5,19 +5,12 @@
 use crate::source_map::SourceMap;
 use anyhow::{format_err, Result};
 use move_ir_types::location::Loc;
-use std::{
- fs::File,
- io::{Read, Write},
- path::Path,
-};
+use std::{fs::File, io::Read, path::Path};
 
 pub type Error = (Loc, String);
 pub type Errors = Vec<Error>;
 
 pub fn source_map_from_file(file_path: &Path) -> Result<SourceMap> {
- if file_path.extension().is_some_and(|ext| ext == "json") {
- return deserialize_from_json(file_path);
- }
  let mut bytes = Vec::new();
  File::open(file_path)
  .ok()
@@ -26,31 +19,3 @@ pub fn source_map_from_file(file_path: &Path) -> Result<SourceMap> {
  bcs::from_bytes::<SourceMap>(&bytes)
  .map_err(|_| format_err!("Error deserializing into source map"))
 }
-
-pub fn serialize_to_json(map: &SourceMap) -> Result<Vec<u8>> {
- serde_json::to_vec(map).map_err(|e| format_err!("Error serializing to json: {}", e))
-}
-
-pub fn serialize_to_json_file(map: &SourceMap, file_path: &Path) -> Result<()> {
- let json = serde_json::to_string_pretty(map)
- .map_err(|e| format_err!("Error serializing to json: {}", e))?;
- let mut f =
- std::fs::File::create(file_path).map_err(|e| format_err!("Error creating file: {}", e))?;
- f.write_all(json.as_bytes())
- .map_err(|e| format_err!("Error writing to file: {}", e))?;
- Ok(())
-}
-
-pub fn deserialize_from_json(file_path: &Path) -> Result<SourceMap> {
- let mut file = File::open(file_path).map_err(|e| format_err!("Error opening file: {}", e))?;
- let mut json = String::new();
- file.read_to_string(&mut json)
- .map_err(|e| format_err!("Error reading file: {}", e))?;
- serde_json::from_str(&json).map_err(|e| format_err!("Error deserializing from json: {}", e))
-}
-
-pub fn convert_to_json(file_path: &Path) -> Result<()> {
- let map = source_map_from_file(file_path)?;
- let json_file_path = file_path.with_extension("json");
- serialize_to_json_file(&map, &json_file_path)
-}

external-crates/move/crates/move-cli/Cargo.toml

@@ -58,10 +58,5 @@ harness = false
 name = "build_testsuite"
 harness = false
 
-[[test]]
-name = "tracing_testsuite"
-harness = false
-
 [features]
 tiered-gas = ["move-vm-test-utils/tiered-gas"]
-gas-profiler = ["move-vm-runtime/gas-profiler"]

external-crates/move/crates/move-cli/src/base/test.rs

@@ -68,10 +68,6 @@ pub struct Test {
  /// The number of iterations to run each test that uses generated values (only used with #[random_test]).
  #[clap(name = "rand-num-iters", long = "rand-num-iters")]
  pub rand_num_iters: Option<u64>,
-
- // Enable tracing for tests
- #[clap(long = "trace-execution", value_name = "PATH")]
- pub trace_execution: Option<Option<String>>,
 }
 
 impl Test {
@@ -112,7 +108,6 @@ impl Test {
  compute_coverage: _,
  seed,
  rand_num_iters,
- trace_execution,
  } = self;
  UnitTestingConfig {
  gas_limit,
@@ -123,7 +118,6 @@ impl Test {
  verbose: verbose_mode,
  seed,
  rand_num_iters,
- trace_execution,
  ..UnitTestingConfig::default_with_bound(None)
  }
  }