Skip to content

Commit

Permalink
Merge pull request #226 from 0xPolygonMiden/greenhat/i208-remove-user…
Browse files Browse the repository at this point in the history
…-ns-in-itests

[3/x] Remove synthetic MASM namespace workaround for the module compiled from Rust
  • Loading branch information
greenhat authored Jul 11, 2024
2 parents 2a901f7 + 2805e16 commit 55691fa
Show file tree
Hide file tree
Showing 80 changed files with 166 additions and 346 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ export.get_inputs
push.4
end

# mod user_ns::abi_transform_tx_kernel_get_inputs_4
# mod abi_transform_tx_kernel_get_inputs_4

use.miden::note

Expand Down Expand Up @@ -3102,8 +3102,6 @@ export."alloc::raw_vec::capacity_overflow"
end


use.user_ns::abi_transform_tx_kernel_get_inputs_4

begin
exec.abi_transform_tx_kernel_get_inputs_4::entrypoint
exec.::abi_transform_tx_kernel_get_inputs_4::entrypoint
end
6 changes: 2 additions & 4 deletions tests/integration/expected/add_felt.masm
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
# mod user_ns::add_felt
# mod add_felt

export.entrypoint
swap.1 add
end


use.user_ns::add_felt

begin
exec.add_felt::entrypoint
exec.::add_felt::entrypoint
end
6 changes: 2 additions & 4 deletions tests/integration/expected/add_i16.masm
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
# mod user_ns::test_rust_bbf5fdc0851222e92e718cc0af28212663b61bc643024537b3041e4528ea338c
# mod test_rust_bbf5fdc0851222e92e718cc0af28212663b61bc643024537b3041e4528ea338c

export.entrypoint
u32wrapping_add
end


use.user_ns::test_rust_bbf5fdc0851222e92e718cc0af28212663b61bc643024537b3041e4528ea338c

begin
exec.test_rust_bbf5fdc0851222e92e718cc0af28212663b61bc643024537b3041e4528ea338c::entrypoint
exec.::test_rust_bbf5fdc0851222e92e718cc0af28212663b61bc643024537b3041e4528ea338c::entrypoint
end
6 changes: 2 additions & 4 deletions tests/integration/expected/add_i32.masm
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
# mod user_ns::test_rust_2e60443dc47eecaf44c0755d01375597814229ddd052f66a9a8f52569d4bee8b
# mod test_rust_2e60443dc47eecaf44c0755d01375597814229ddd052f66a9a8f52569d4bee8b

export.entrypoint
u32wrapping_add
end


use.user_ns::test_rust_2e60443dc47eecaf44c0755d01375597814229ddd052f66a9a8f52569d4bee8b

begin
exec.test_rust_2e60443dc47eecaf44c0755d01375597814229ddd052f66a9a8f52569d4bee8b::entrypoint
exec.::test_rust_2e60443dc47eecaf44c0755d01375597814229ddd052f66a9a8f52569d4bee8b::entrypoint
end
6 changes: 2 additions & 4 deletions tests/integration/expected/add_i8.masm
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
# mod user_ns::test_rust_aa4e8ec18774f7791634833f5a14b633e4c1a7d4ec8ae07ec95668a9f3fb05d6
# mod test_rust_aa4e8ec18774f7791634833f5a14b633e4c1a7d4ec8ae07ec95668a9f3fb05d6

export.entrypoint
u32wrapping_add
end


use.user_ns::test_rust_aa4e8ec18774f7791634833f5a14b633e4c1a7d4ec8ae07ec95668a9f3fb05d6

begin
exec.test_rust_aa4e8ec18774f7791634833f5a14b633e4c1a7d4ec8ae07ec95668a9f3fb05d6::entrypoint
exec.::test_rust_aa4e8ec18774f7791634833f5a14b633e4c1a7d4ec8ae07ec95668a9f3fb05d6::entrypoint
end
6 changes: 2 additions & 4 deletions tests/integration/expected/add_u16.masm
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
# mod user_ns::test_rust_10c9fc505476d6021538a9abdcf2c4d73bd1d8cc42c25993867649bb63b4319d
# mod test_rust_10c9fc505476d6021538a9abdcf2c4d73bd1d8cc42c25993867649bb63b4319d

export.entrypoint
u32wrapping_add push.65535 u32and
end


use.user_ns::test_rust_10c9fc505476d6021538a9abdcf2c4d73bd1d8cc42c25993867649bb63b4319d

begin
exec.test_rust_10c9fc505476d6021538a9abdcf2c4d73bd1d8cc42c25993867649bb63b4319d::entrypoint
exec.::test_rust_10c9fc505476d6021538a9abdcf2c4d73bd1d8cc42c25993867649bb63b4319d::entrypoint
end
6 changes: 2 additions & 4 deletions tests/integration/expected/add_u32.masm
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
# mod user_ns::test_rust_d6a5f6b2fb9509a2986e40a5ab057ae035f5eeb6fb66c1c0bd59648ee4c31a35
# mod test_rust_d6a5f6b2fb9509a2986e40a5ab057ae035f5eeb6fb66c1c0bd59648ee4c31a35

export.entrypoint
u32wrapping_add
end


use.user_ns::test_rust_d6a5f6b2fb9509a2986e40a5ab057ae035f5eeb6fb66c1c0bd59648ee4c31a35

begin
exec.test_rust_d6a5f6b2fb9509a2986e40a5ab057ae035f5eeb6fb66c1c0bd59648ee4c31a35::entrypoint
exec.::test_rust_d6a5f6b2fb9509a2986e40a5ab057ae035f5eeb6fb66c1c0bd59648ee4c31a35::entrypoint
end
6 changes: 2 additions & 4 deletions tests/integration/expected/add_u8.masm
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
# mod user_ns::test_rust_4a87475b2f9d8d15ad35a776ff173dc1470f87cacd0a8312306b9896bb828aa3
# mod test_rust_4a87475b2f9d8d15ad35a776ff173dc1470f87cacd0a8312306b9896bb828aa3

export.entrypoint
u32wrapping_add push.255 u32and
end


use.user_ns::test_rust_4a87475b2f9d8d15ad35a776ff173dc1470f87cacd0a8312306b9896bb828aa3

begin
exec.test_rust_4a87475b2f9d8d15ad35a776ff173dc1470f87cacd0a8312306b9896bb828aa3::entrypoint
exec.::test_rust_4a87475b2f9d8d15ad35a776ff173dc1470f87cacd0a8312306b9896bb828aa3::entrypoint
end
6 changes: 2 additions & 4 deletions tests/integration/expected/and_bool.masm
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
# mod user_ns::test_rust_4ac99d1101f79650c02e85b18d774a8cfc696b791a33e4cbd07338faa6df2814
# mod test_rust_4ac99d1101f79650c02e85b18d774a8cfc696b791a33e4cbd07338faa6df2814

export.entrypoint
swap.1 u32and
end


use.user_ns::test_rust_4ac99d1101f79650c02e85b18d774a8cfc696b791a33e4cbd07338faa6df2814

begin
exec.test_rust_4ac99d1101f79650c02e85b18d774a8cfc696b791a33e4cbd07338faa6df2814::entrypoint
exec.::test_rust_4ac99d1101f79650c02e85b18d774a8cfc696b791a33e4cbd07338faa6df2814::entrypoint
end
6 changes: 2 additions & 4 deletions tests/integration/expected/and_i16.masm
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
# mod user_ns::test_rust_c7e9cce9483c4fd7983b386cae179d4a54022802e0d6b932bccd80235b921c40
# mod test_rust_c7e9cce9483c4fd7983b386cae179d4a54022802e0d6b932bccd80235b921c40

export.entrypoint
u32and
end


use.user_ns::test_rust_c7e9cce9483c4fd7983b386cae179d4a54022802e0d6b932bccd80235b921c40

begin
exec.test_rust_c7e9cce9483c4fd7983b386cae179d4a54022802e0d6b932bccd80235b921c40::entrypoint
exec.::test_rust_c7e9cce9483c4fd7983b386cae179d4a54022802e0d6b932bccd80235b921c40::entrypoint
end
6 changes: 2 additions & 4 deletions tests/integration/expected/and_i32.masm
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
# mod user_ns::test_rust_8391b0d837d3b65b33c6b68ea552987952048935f4c45fadd58b81ea8ba141d9
# mod test_rust_8391b0d837d3b65b33c6b68ea552987952048935f4c45fadd58b81ea8ba141d9

export.entrypoint
u32and
end


use.user_ns::test_rust_8391b0d837d3b65b33c6b68ea552987952048935f4c45fadd58b81ea8ba141d9

begin
exec.test_rust_8391b0d837d3b65b33c6b68ea552987952048935f4c45fadd58b81ea8ba141d9::entrypoint
exec.::test_rust_8391b0d837d3b65b33c6b68ea552987952048935f4c45fadd58b81ea8ba141d9::entrypoint
end
6 changes: 2 additions & 4 deletions tests/integration/expected/and_i8.masm
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
# mod user_ns::test_rust_645dc02b90fa56981e2f5305f2d8f5067bb8cdc2eb91b610298ef135bd758d31
# mod test_rust_645dc02b90fa56981e2f5305f2d8f5067bb8cdc2eb91b610298ef135bd758d31

export.entrypoint
u32and
end


use.user_ns::test_rust_645dc02b90fa56981e2f5305f2d8f5067bb8cdc2eb91b610298ef135bd758d31

begin
exec.test_rust_645dc02b90fa56981e2f5305f2d8f5067bb8cdc2eb91b610298ef135bd758d31::entrypoint
exec.::test_rust_645dc02b90fa56981e2f5305f2d8f5067bb8cdc2eb91b610298ef135bd758d31::entrypoint
end
6 changes: 2 additions & 4 deletions tests/integration/expected/and_u16.masm
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
# mod user_ns::test_rust_552e799f48de5fcc388eaa5128c9842db9a9500f75f852887a429dbe8c67d810
# mod test_rust_552e799f48de5fcc388eaa5128c9842db9a9500f75f852887a429dbe8c67d810

export.entrypoint
u32and
end


use.user_ns::test_rust_552e799f48de5fcc388eaa5128c9842db9a9500f75f852887a429dbe8c67d810

begin
exec.test_rust_552e799f48de5fcc388eaa5128c9842db9a9500f75f852887a429dbe8c67d810::entrypoint
exec.::test_rust_552e799f48de5fcc388eaa5128c9842db9a9500f75f852887a429dbe8c67d810::entrypoint
end
6 changes: 2 additions & 4 deletions tests/integration/expected/and_u32.masm
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
# mod user_ns::test_rust_03ecb06cdac4759a31c320b67e5a88995c8e5b0260bc540636a10106839a7c13
# mod test_rust_03ecb06cdac4759a31c320b67e5a88995c8e5b0260bc540636a10106839a7c13

export.entrypoint
u32and
end


use.user_ns::test_rust_03ecb06cdac4759a31c320b67e5a88995c8e5b0260bc540636a10106839a7c13

begin
exec.test_rust_03ecb06cdac4759a31c320b67e5a88995c8e5b0260bc540636a10106839a7c13::entrypoint
exec.::test_rust_03ecb06cdac4759a31c320b67e5a88995c8e5b0260bc540636a10106839a7c13::entrypoint
end
6 changes: 2 additions & 4 deletions tests/integration/expected/and_u8.masm
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
# mod user_ns::test_rust_dc5c0d94136b471b7115e3df5c99cd5b9ebfb25f4c88e0039211a30936a42650
# mod test_rust_dc5c0d94136b471b7115e3df5c99cd5b9ebfb25f4c88e0039211a30936a42650

export.entrypoint
u32and
end


use.user_ns::test_rust_dc5c0d94136b471b7115e3df5c99cd5b9ebfb25f4c88e0039211a30936a42650

begin
exec.test_rust_dc5c0d94136b471b7115e3df5c99cd5b9ebfb25f4c88e0039211a30936a42650::entrypoint
exec.::test_rust_dc5c0d94136b471b7115e3df5c99cd5b9ebfb25f4c88e0039211a30936a42650::entrypoint
end
6 changes: 2 additions & 4 deletions tests/integration/expected/div_felt.masm
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
# mod user_ns::div_felt
# mod div_felt

export.entrypoint
swap.1 div
end


use.user_ns::div_felt

begin
exec.div_felt::entrypoint
exec.::div_felt::entrypoint
end
6 changes: 2 additions & 4 deletions tests/integration/expected/eq_felt.masm
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
# mod user_ns::eq_felt
# mod eq_felt

export.entrypoint
swap.1 eq push.1 eq
end


use.user_ns::eq_felt

begin
exec.eq_felt::entrypoint
exec.::eq_felt::entrypoint
end
6 changes: 2 additions & 4 deletions tests/integration/expected/eq_i16.masm
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
# mod user_ns::test_rust_d3eecc0932c0745000688bf699bae5c588052144cdbc0bc7c4ab37c3cc14cd7b
# mod test_rust_d3eecc0932c0745000688bf699bae5c588052144cdbc0bc7c4ab37c3cc14cd7b

export.entrypoint
swap.1 eq
end


use.user_ns::test_rust_d3eecc0932c0745000688bf699bae5c588052144cdbc0bc7c4ab37c3cc14cd7b

begin
exec.test_rust_d3eecc0932c0745000688bf699bae5c588052144cdbc0bc7c4ab37c3cc14cd7b::entrypoint
exec.::test_rust_d3eecc0932c0745000688bf699bae5c588052144cdbc0bc7c4ab37c3cc14cd7b::entrypoint
end
6 changes: 2 additions & 4 deletions tests/integration/expected/eq_i32.masm
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
# mod user_ns::test_rust_535f5a5a2d649df390220a07008a31a5226ad26f1cf27c7849e47c754842ec03
# mod test_rust_535f5a5a2d649df390220a07008a31a5226ad26f1cf27c7849e47c754842ec03

export.entrypoint
swap.1 eq
end


use.user_ns::test_rust_535f5a5a2d649df390220a07008a31a5226ad26f1cf27c7849e47c754842ec03

begin
exec.test_rust_535f5a5a2d649df390220a07008a31a5226ad26f1cf27c7849e47c754842ec03::entrypoint
exec.::test_rust_535f5a5a2d649df390220a07008a31a5226ad26f1cf27c7849e47c754842ec03::entrypoint
end
6 changes: 2 additions & 4 deletions tests/integration/expected/eq_i64.masm
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# mod user_ns::test_rust_c0b1348123b7005d1a5f70ddc2c38a3fc27e908c3656adebf0eae90cdbc8959d
# mod test_rust_c0b1348123b7005d1a5f70ddc2c38a3fc27e908c3656adebf0eae90cdbc8959d

export.entrypoint
movdn.3
Expand All @@ -11,8 +11,6 @@ export.entrypoint
end


use.user_ns::test_rust_c0b1348123b7005d1a5f70ddc2c38a3fc27e908c3656adebf0eae90cdbc8959d

begin
exec.test_rust_c0b1348123b7005d1a5f70ddc2c38a3fc27e908c3656adebf0eae90cdbc8959d::entrypoint
exec.::test_rust_c0b1348123b7005d1a5f70ddc2c38a3fc27e908c3656adebf0eae90cdbc8959d::entrypoint
end
6 changes: 2 additions & 4 deletions tests/integration/expected/eq_i8.masm
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
# mod user_ns::test_rust_58aae86db503f25d519c45a178d348c9fa62ad89779c3a7beb32041962ccbd8a
# mod test_rust_58aae86db503f25d519c45a178d348c9fa62ad89779c3a7beb32041962ccbd8a

export.entrypoint
swap.1 eq
end


use.user_ns::test_rust_58aae86db503f25d519c45a178d348c9fa62ad89779c3a7beb32041962ccbd8a

begin
exec.test_rust_58aae86db503f25d519c45a178d348c9fa62ad89779c3a7beb32041962ccbd8a::entrypoint
exec.::test_rust_58aae86db503f25d519c45a178d348c9fa62ad89779c3a7beb32041962ccbd8a::entrypoint
end
6 changes: 2 additions & 4 deletions tests/integration/expected/eq_u16.masm
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
# mod user_ns::test_rust_bf5c0ccc66e1188e428efe75b85c06065d267030df6b1c191b2ee935ea27795d
# mod test_rust_bf5c0ccc66e1188e428efe75b85c06065d267030df6b1c191b2ee935ea27795d

export.entrypoint
swap.1 eq
end


use.user_ns::test_rust_bf5c0ccc66e1188e428efe75b85c06065d267030df6b1c191b2ee935ea27795d

begin
exec.test_rust_bf5c0ccc66e1188e428efe75b85c06065d267030df6b1c191b2ee935ea27795d::entrypoint
exec.::test_rust_bf5c0ccc66e1188e428efe75b85c06065d267030df6b1c191b2ee935ea27795d::entrypoint
end
6 changes: 2 additions & 4 deletions tests/integration/expected/eq_u32.masm
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
# mod user_ns::test_rust_8fb01b80f31505a22343d7c26e3474f1160b5bf9f9048fa61561f108ac0be95e
# mod test_rust_8fb01b80f31505a22343d7c26e3474f1160b5bf9f9048fa61561f108ac0be95e

export.entrypoint
swap.1 eq
end


use.user_ns::test_rust_8fb01b80f31505a22343d7c26e3474f1160b5bf9f9048fa61561f108ac0be95e

begin
exec.test_rust_8fb01b80f31505a22343d7c26e3474f1160b5bf9f9048fa61561f108ac0be95e::entrypoint
exec.::test_rust_8fb01b80f31505a22343d7c26e3474f1160b5bf9f9048fa61561f108ac0be95e::entrypoint
end
6 changes: 2 additions & 4 deletions tests/integration/expected/eq_u64.masm
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# mod user_ns::test_rust_23a27398cbfb7447cb610e7b877565f4e43d633b55f98504051b93381d40740f
# mod test_rust_23a27398cbfb7447cb610e7b877565f4e43d633b55f98504051b93381d40740f

export.entrypoint
movdn.3
Expand All @@ -11,8 +11,6 @@ export.entrypoint
end


use.user_ns::test_rust_23a27398cbfb7447cb610e7b877565f4e43d633b55f98504051b93381d40740f

begin
exec.test_rust_23a27398cbfb7447cb610e7b877565f4e43d633b55f98504051b93381d40740f::entrypoint
exec.::test_rust_23a27398cbfb7447cb610e7b877565f4e43d633b55f98504051b93381d40740f::entrypoint
end
Loading

0 comments on commit 55691fa

Please sign in to comment.