diff --git a/sway-core/src/asm_generation/from_ir.rs b/sway-core/src/asm_generation/from_ir.rs index d55b8a6536c..9413baa7632 100644 --- a/sway-core/src/asm_generation/from_ir.rs +++ b/sway-core/src/asm_generation/from_ir.rs @@ -11,7 +11,7 @@ use std::collections::HashMap; use crate::{ asm_generation::{ - build_contract_abi_switch, build_preamble, finalized_asm::FinalizedAsm, + build_contract_abi_switch, build_preamble, compiler_constants, finalized_asm::FinalizedAsm, register_sequencer::RegisterSequencer, AbstractInstructionSet, DataId, DataSection, SwayAsmSet, }, @@ -227,16 +227,101 @@ impl<'ir> AsmBuilder<'ir> { return; } - // Nothing to do if there are no arguments - if function.args_iter(self.context).next().is_none() { - return; + match function.args_iter(self.context).count() { + // Nothing to do if there are no arguments + 0 => (), + + // A special case for when there's only a single arg, its value (or address) is placed + // directly in the base register. + 1 => { + let (_, val) = function.args_iter(self.context).next().unwrap(); + let single_arg_reg = self.value_to_register(val); + self.read_args_value_from_frame(&single_arg_reg); + } + + // Otherwise, the args are bundled together and pointed to by the base register. + _ => { + let args_base_reg = self.reg_seqr.next(); + self.read_args_value_from_frame(&args_base_reg); + + // Successively load each argument. The asm generated depends on the arg type size + // and whether the offset fits in a 12-bit immediate. + let mut arg_word_offset = 0; + for (name, val) in function.args_iter(self.context) { + let current_arg_reg = self.value_to_register(val); + let arg_type = val.get_type(self.context).unwrap(); + let arg_type_size_bytes = ir_type_size_in_bytes(self.context, &arg_type); + if arg_type.is_copy_type() { + if arg_word_offset > compiler_constants::TWELVE_BITS { + let offs_reg = self.reg_seqr.next(); + self.bytecode.push(Op { + opcode: Either::Left(VirtualOp::ADD( + args_base_reg.clone(), + args_base_reg.clone(), + offs_reg.clone(), + )), + comment: format!("Get offset for arg {}", name), + owning_span: None, + }); + self.bytecode.push(Op { + opcode: Either::Left(VirtualOp::LW( + current_arg_reg.clone(), + offs_reg, + VirtualImmediate12 { value: 0 }, + )), + comment: format!("Get arg {}", name), + owning_span: None, + }); + } else { + self.bytecode.push(Op { + opcode: Either::Left(VirtualOp::LW( + current_arg_reg.clone(), + args_base_reg.clone(), + VirtualImmediate12 { + value: arg_word_offset as u16, + }, + )), + comment: format!("Get arg {}", name), + owning_span: None, + }); + } + } else if arg_word_offset * 8 > compiler_constants::TWELVE_BITS { + let offs_reg = self.reg_seqr.next(); + self.number_to_reg(arg_word_offset * 8, &offs_reg, None); + self.bytecode.push(Op { + opcode: either::Either::Left(VirtualOp::ADD( + current_arg_reg.clone(), + args_base_reg.clone(), + offs_reg, + )), + comment: format!("Get offset or arg {}", name), + owning_span: None, + }); + } else { + self.bytecode.push(Op { + opcode: either::Either::Left(VirtualOp::ADDI( + current_arg_reg.clone(), + args_base_reg.clone(), + VirtualImmediate12 { + value: (arg_word_offset * 8) as u16, + }, + )), + comment: format!("Get address for arg {}", name), + owning_span: None, + }); + } + + arg_word_offset += size_bytes_in_words!(arg_type_size_bytes); + } + } } + } - // Base pointer for the arumgnets using the $fp register - let args_base_reg = self.reg_seqr.next(); + // Read the argument(s) base from the call frame. + fn read_args_value_from_frame(&mut self, reg: &VirtualRegister) { self.bytecode.push(Op { opcode: Either::Left(VirtualOp::LW( - args_base_reg.clone(), + reg.clone(), VirtualRegister::Constant(ConstantRegister::FramePointer), // see https://github.com/FuelLabs/fuel-specs/pull/193#issuecomment-876496372 VirtualImmediate12 { value: 74 }, @@ -244,76 +329,6 @@ impl<'ir> AsmBuilder<'ir> { comment: "Base register for method parameter".into(), owning_span: None, }); - - // Successively load each argument. The asm generated depends on the arg type size and - // whether the offset fits in a 12-bit immediate. - let mut arg_word_offset = 0; - for (name, val) in function.args_iter(self.context) { - let current_arg_reg = self.value_to_register(val); - let arg_type = val.get_type(self.context).unwrap(); - let arg_type_size_bytes = ir_type_size_in_bytes(self.context, &arg_type); - if arg_type.is_copy_type() { - if arg_word_offset > crate::asm_generation::compiler_constants::TWELVE_BITS { - let offs_reg = self.reg_seqr.next(); - self.bytecode.push(Op { - opcode: Either::Left(VirtualOp::ADD( - args_base_reg.clone(), - args_base_reg.clone(), - offs_reg.clone(), - )), - comment: format!("Get offset for arg {}", name), - owning_span: None, - }); - self.bytecode.push(Op { - opcode: Either::Left(VirtualOp::LW( - current_arg_reg.clone(), - offs_reg, - VirtualImmediate12 { value: 0 }, - )), - comment: format!("Get arg {}", name), - owning_span: None, - }); - } else { - self.bytecode.push(Op { - opcode: Either::Left(VirtualOp::LW( - current_arg_reg.clone(), - args_base_reg.clone(), - VirtualImmediate12 { - value: arg_word_offset as u16, - }, - )), - comment: format!("Get arg {}", name), - owning_span: None, - }); - } - } else if arg_word_offset * 8 > crate::asm_generation::compiler_constants::TWELVE_BITS { - let offs_reg = self.reg_seqr.next(); - self.number_to_reg(arg_word_offset * 8, &offs_reg, None); - self.bytecode.push(Op { - opcode: either::Either::Left(VirtualOp::ADD( - current_arg_reg.clone(), - args_base_reg.clone(), - offs_reg, - )), - comment: format!("Get offset or arg {}", name), - owning_span: None, - }); - } else { - self.bytecode.push(Op { - opcode: either::Either::Left(VirtualOp::ADDI( - current_arg_reg.clone(), - args_base_reg.clone(), - VirtualImmediate12 { - value: (arg_word_offset * 8) as u16, - }, - )), - comment: format!("Get address for arg {}", name), - owning_span: None, - }); - } - - arg_word_offset += arg_type_size_bytes / 8; - } } fn add_locals(&mut self, function: Function) { @@ -371,7 +386,7 @@ impl<'ir> AsmBuilder<'ir> { // It's possible (though undesirable) to have empty local data structures only. if stack_base != 0 { - if stack_base * 8 > crate::asm_generation::compiler_constants::TWENTY_FOUR_BITS { + if stack_base * 8 > compiler_constants::TWENTY_FOUR_BITS { todo!("Enormous stack usage for locals."); } let mut alloc_op = Op::unowned_stack_allocate_memory(VirtualImmediate24 { @@ -407,6 +422,20 @@ impl<'ir> AsmBuilder<'ir> { } fn compile_function(&mut self, function: Function) -> CompileResult<()> { + if function.has_selector(self.context) { + // Add a comment noting that this is a named contract method. + self.bytecode.push(Op::new_comment(format!( + "contract method: {}, selector: 0x{}", + function.get_name(self.context), + function + .get_selector(self.context) + .unwrap() + .into_iter() + .map(|b| format!("{b:02x}")) + .collect::() + ))); + } + // Compile instructions. self.add_locals(function); self.compile_fn_args(function); @@ -835,7 +864,7 @@ impl<'ir> AsmBuilder<'ir> { }); } else { // Value too big for a register, so we return the memory offset. - if elem_size > crate::asm_generation::compiler_constants::TWELVE_BITS { + if elem_size > compiler_constants::TWELVE_BITS { let size_data_id = self .data_section .insert_data_value(&Literal::U64(elem_size)); @@ -888,7 +917,7 @@ impl<'ir> AsmBuilder<'ir> { let instr_reg = self.reg_seqr.next(); if field_type.is_copy_type() { - if extract_offset > crate::asm_generation::compiler_constants::TWELVE_BITS { + if extract_offset > compiler_constants::TWELVE_BITS { let offset_reg = self.reg_seqr.next(); self.number_to_reg( extract_offset, @@ -942,7 +971,7 @@ impl<'ir> AsmBuilder<'ir> { } } else { // Value too big for a register, so we return the memory offset. - if extract_offset * 8 > crate::asm_generation::compiler_constants::TWELVE_BITS { + if extract_offset * 8 > compiler_constants::TWELVE_BITS { let offset_reg = self.reg_seqr.next(); self.number_to_reg( extract_offset * 8, @@ -996,7 +1025,7 @@ impl<'ir> AsmBuilder<'ir> { let offset_in_bytes = word_offs * 8 + ptr_ty_size_in_bytes * offset; let instr_reg = self.reg_seqr.next(); - if offset_in_bytes > crate::asm_generation::compiler_constants::TWELVE_BITS { + if offset_in_bytes > compiler_constants::TWELVE_BITS { self.number_to_reg( offset_in_bytes, &instr_reg, @@ -1069,7 +1098,7 @@ impl<'ir> AsmBuilder<'ir> { }); } else { // Element size is larger than 8; we switch to bytewise offsets and sizes and use MCP. - if elem_size > crate::asm_generation::compiler_constants::TWELVE_BITS { + if elem_size > compiler_constants::TWELVE_BITS { todo!("array element size bigger than 4k") } else { let elem_index_offs_reg = self.reg_seqr.next(); @@ -1135,7 +1164,7 @@ impl<'ir> AsmBuilder<'ir> { .collect::>() .join(","); if value.get_type(self.context).unwrap().is_copy_type() { - if insert_offs > crate::asm_generation::compiler_constants::TWELVE_BITS { + if insert_offs > compiler_constants::TWELVE_BITS { let insert_offs_reg = self.reg_seqr.next(); self.number_to_reg( insert_offs, @@ -1175,7 +1204,7 @@ impl<'ir> AsmBuilder<'ir> { } } else { let offs_reg = self.reg_seqr.next(); - if insert_offs * 8 > crate::asm_generation::compiler_constants::TWELVE_BITS { + if insert_offs * 8 > compiler_constants::TWELVE_BITS { self.number_to_reg(insert_offs * 8, &offs_reg, instr_val.get_span(self.context)); } else { self.bytecode.push(Op { @@ -1190,7 +1219,7 @@ impl<'ir> AsmBuilder<'ir> { owning_span: instr_val.get_span(self.context), }); } - if value_size > crate::asm_generation::compiler_constants::TWELVE_BITS { + if value_size > compiler_constants::TWELVE_BITS { let size_reg = self.reg_seqr.next(); self.number_to_reg(value_size, &size_reg, instr_val.get_span(self.context)); self.bytecode.push(Op { @@ -1244,7 +1273,7 @@ impl<'ir> AsmBuilder<'ir> { // XXX Need to check for zero sized types? if load_size_in_words == 1 { // Value can fit in a register, so we load the value. - if word_offs > crate::asm_generation::compiler_constants::TWELVE_BITS { + if word_offs > compiler_constants::TWELVE_BITS { let offs_reg = self.reg_seqr.next(); self.bytecode.push(Op { opcode: Either::Left(VirtualOp::ADD( @@ -1281,7 +1310,7 @@ impl<'ir> AsmBuilder<'ir> { // Value too big for a register, so we return the memory offset. This is // what LW to the data section does, via LWDataId. let word_offs = word_offs * 8; - if word_offs > crate::asm_generation::compiler_constants::TWELVE_BITS { + if word_offs > compiler_constants::TWELVE_BITS { let offs_reg = self.reg_seqr.next(); self.number_to_reg( word_offs, @@ -1399,7 +1428,7 @@ impl<'ir> AsmBuilder<'ir> { span: Option, ) -> VirtualRegister { let offset_reg = self.reg_seqr.next(); - if offset_in_bytes > crate::asm_generation::compiler_constants::TWELVE_BITS { + if offset_in_bytes > compiler_constants::TWELVE_BITS { let offs_reg = self.reg_seqr.next(); self.number_to_reg(offset_in_bytes, &offs_reg, span.clone()); self.bytecode.push(Op { @@ -1628,7 +1657,7 @@ impl<'ir> AsmBuilder<'ir> { }); tmp_reg }; - if word_offs > crate::asm_generation::compiler_constants::TWELVE_BITS { + if word_offs > compiler_constants::TWELVE_BITS { let offs_reg = self.reg_seqr.next(); self.number_to_reg( word_offs, @@ -1672,9 +1701,7 @@ impl<'ir> AsmBuilder<'ir> { // Bigger than 1 word needs a MCPI. XXX Or MCP if it's huge. let dest_offs_reg = self.reg_seqr.next(); - if word_offs * 8 - > crate::asm_generation::compiler_constants::TWELVE_BITS - { + if word_offs * 8 > compiler_constants::TWELVE_BITS { self.number_to_reg( word_offs * 8, &dest_offs_reg, @@ -1703,9 +1730,7 @@ impl<'ir> AsmBuilder<'ir> { }); } - if store_size_in_words * 8 - > crate::asm_generation::compiler_constants::TWELVE_BITS - { + if store_size_in_words * 8 > compiler_constants::TWELVE_BITS { let size_reg = self.reg_seqr.next(); self.number_to_reg( store_size_in_words * 8, @@ -1778,9 +1803,7 @@ impl<'ir> AsmBuilder<'ir> { let total_size = size_bytes_round_up_to_word_alignment!( self.constant_size_in_bytes(constant) ); - if total_size - > crate::asm_generation::compiler_constants::TWENTY_FOUR_BITS - { + if total_size > compiler_constants::TWENTY_FOUR_BITS { todo!("Enormous stack usage for locals."); } @@ -1878,7 +1901,7 @@ impl<'ir> AsmBuilder<'ir> { } fn number_to_reg(&mut self, offset: u64, offset_reg: &VirtualRegister, span: Option) { - if offset > crate::asm_generation::compiler_constants::TWENTY_FOUR_BITS { + if offset > compiler_constants::TWENTY_FOUR_BITS { todo!("Absolutely giant arrays."); } @@ -1971,7 +1994,7 @@ impl<'ir> AsmBuilder<'ir> { // needs to use a MCP instruction. if matches!(lit, Literal::B256(_)) { let offs_reg = self.reg_seqr.next(); - if offs_in_words * 8 > crate::asm_generation::compiler_constants::TWELVE_BITS { + if offs_in_words * 8 > compiler_constants::TWELVE_BITS { self.number_to_reg(offs_in_words * 8, &offs_reg, span.clone()); self.bytecode.push(Op { opcode: either::Either::Left(VirtualOp::ADD( @@ -2007,7 +2030,7 @@ impl<'ir> AsmBuilder<'ir> { 4 // 32 bytes is 4 words. } else { - if offs_in_words > crate::asm_generation::compiler_constants::TWELVE_BITS { + if offs_in_words > compiler_constants::TWELVE_BITS { let offs_reg = self.reg_seqr.next(); self.number_to_reg(offs_in_words, &offs_reg, span.clone()); self.bytecode.push(Op { diff --git a/sway-core/tests/ir_to_asm/nested_single_word_struct.asm b/sway-core/tests/ir_to_asm/nested_single_word_struct.asm index eb82731d6d3..bbe8b022469 100644 --- a/sway-core/tests/ir_to_asm/nested_single_word_struct.asm +++ b/sway-core/tests/ir_to_asm/nested_single_word_struct.asm @@ -11,10 +11,8 @@ eq $r0 $r1 $r0 ; function selector comparison jnei $zero $r0 i11 ; jump to selected function rvrt $zero ; revert if no selectors matched lw $r0 $fp i74 ; Base register for method parameter -addi $r0 $r0 i0 ; Get address for arg input1 addi $r0 $r0 i0 ; extract address lw $r0 $r0 i0 ; extract_value @ 0 ret $r0 -noop ; word-alignment of data section .data: data_0 .u32 0x495d4a23 diff --git a/sway-core/tests/ir_to_asm/simple_contract.asm b/sway-core/tests/ir_to_asm/simple_contract.asm index 39b832186be..6403a33b81b 100644 --- a/sway-core/tests/ir_to_asm/simple_contract.asm +++ b/sway-core/tests/ir_to_asm/simple_contract.asm @@ -5,22 +5,20 @@ DATA_SECTION_OFFSET[0..32] DATA_SECTION_OFFSET[32..64] lw $ds $is 1 add $$ds $$ds $is -lw $r1 $fp i73 ; load input function selector -lw $r0 data_2 ; load fn selector for comparison -eq $r0 $r1 $r0 ; function selector comparison -jnei $zero $r0 i17 ; jump to selected function -lw $r0 data_3 ; load fn selector for comparison -eq $r0 $r1 $r0 ; function selector comparison -jnei $zero $r0 i20 ; jump to selected function -lw $r0 data_4 ; load fn selector for comparison -eq $r0 $r1 $r0 ; function selector comparison -jnei $zero $r0 i24 ; jump to selected function +lw $r0 $fp i73 ; load input function selector +lw $r1 data_2 ; load fn selector for comparison +eq $r1 $r0 $r1 ; function selector comparison +jnei $zero $r1 i17 ; jump to selected function +lw $r1 data_3 ; load fn selector for comparison +eq $r1 $r0 $r1 ; function selector comparison +jnei $zero $r1 i19 ; jump to selected function +lw $r1 data_4 ; load fn selector for comparison +eq $r0 $r0 $r1 ; function selector comparison +jnei $zero $r0 i22 ; jump to selected function rvrt $zero ; revert if no selectors matched lw $r0 $fp i74 ; Base register for method parameter -lw $r0 $r0 i0 ; Get arg val ret $r0 -lw $r0 $fp i74 ; Base register for method parameter -addi $r1 $r0 i0 ; Get address for arg val +lw $r1 $fp i74 ; Base register for method parameter lw $r0 data_0 ; loading size for RETD retd $r1 $r0 lw $r1 $fp i74 ; Base register for method parameter diff --git a/sway-lib-std/tests/test_projects/context/mod.rs b/sway-lib-std/tests/test_projects/context/mod.rs index 5e1e8c641b9..56847ffad2c 100644 --- a/sway-lib-std/tests/test_projects/context/mod.rs +++ b/sway-lib-std/tests/test_projects/context/mod.rs @@ -66,14 +66,13 @@ async fn can_get_this_balance() { .await .unwrap(); - // TEMPORARILY DISABLED until https://github.com/FuelLabs/fuels-rs/issues/201 is resolved. - //caller_instance - // .call_receive_coins(send_amount, context_sway_id) - // .set_contracts(&[context_id]) - // .tx_params(TxParameters::new(None, Some(1_000_000), None)) - // .call() - // .await - // .unwrap(); + caller_instance + .call_receive_coins(send_amount, context_sway_id) + .set_contracts(&[context_id]) + .tx_params(TxParameters::new(None, Some(1_000_000), None)) + .call() + .await + .unwrap(); let result = context_instance .get_this_balance(caller_sway_id) @@ -81,8 +80,7 @@ async fn can_get_this_balance() { .await .unwrap(); - // TEMPORARILY DISABLED until https://github.com/FuelLabs/fuels-rs/issues/201 is resolved. - //assert_eq!(result.value, send_amount); + assert_eq!(result.value, send_amount); } #[tokio::test] @@ -106,8 +104,7 @@ async fn can_get_balance_of_contract() { .await .unwrap(); - // TEMPORARILY DISABLED until https://github.com/FuelLabs/fuels-rs/issues/201 is resolved. - //assert_eq!(result.value, send_amount); + assert_eq!(result.value, send_amount); } #[tokio::test] @@ -151,16 +148,15 @@ async fn can_get_msg_id() { .await .unwrap(); - // TEMPORARILY DISABLED until https://github.com/FuelLabs/fuels-rs/issues/201 is resolved. - //let result = caller_instance - // .call_get_asset_id_with_coins(send_amount, context_sway_id) - // .set_contracts(&[caller_id, context_id]) - // .tx_params(TxParameters::new(None, Some(1_000_000), None)) - // .call() - // .await - // .unwrap(); - // - //assert_eq!(result.value, caller_sway_id); + let result = caller_instance + .call_get_asset_id_with_coins(send_amount, context_sway_id) + .set_contracts(&[caller_id, context_id]) + .tx_params(TxParameters::new(None, Some(1_000_000), None)) + .call() + .await + .unwrap(); + + assert_eq!(result.value, caller_sway_id); } #[tokio::test] diff --git a/sway-lib-std/tests/test_projects/token_ops/mod.rs b/sway-lib-std/tests/test_projects/token_ops/mod.rs index fdb83463308..2d31bf1695a 100644 --- a/sway-lib-std/tests/test_projects/token_ops/mod.rs +++ b/sway-lib-std/tests/test_projects/token_ops/mod.rs @@ -34,8 +34,7 @@ async fn can_mint() { .call() .await .unwrap(); - // TEMPORARILY DISABLED until https://github.com/FuelLabs/fuels-rs/issues/201 is resolved. - //assert_eq!(balance_result.value, 11); + assert_eq!(balance_result.value, 11); } #[tokio::test] @@ -56,15 +55,14 @@ async fn can_burn() { assert_eq!(balance_result.value, 0); fuelcoin_instance.mint_coins(11).call().await.unwrap(); - // TEMPORARILY DISABLED until https://github.com/FuelLabs/fuels-rs/issues/201 is resolved. - //fuelcoin_instance.burn_coins(7).call().await.unwrap(); - // - //balance_result = fuelcoin_instance - // .get_balance(target, asset_id) - // .call() - // .await - // .unwrap(); - //assert_eq!(balance_result.value, 4); + fuelcoin_instance.burn_coins(7).call().await.unwrap(); + + balance_result = fuelcoin_instance + .get_balance(target, asset_id) + .call() + .await + .unwrap(); + assert_eq!(balance_result.value, 4); } #[tokio::test] @@ -91,13 +89,12 @@ async fn can_force_transfer() { fuelcoin_instance.mint_coins(100).call().await.unwrap(); - // TEMPORARILY DISABLED until https://github.com/FuelLabs/fuels-rs/issues/201 is resolved. - //balance_result = fuelcoin_instance - // .get_balance(asset_id.clone(), asset_id.clone()) - // .call() - // .await - // .unwrap(); - //assert_eq!(balance_result.value, 100); + balance_result = fuelcoin_instance + .get_balance(asset_id.clone(), asset_id.clone()) + .call() + .await + .unwrap(); + assert_eq!(balance_result.value, 100); // confirm initial balance on balance contract (recipient) balance_result = fuelcoin_instance @@ -110,13 +107,12 @@ async fn can_force_transfer() { let coins = 42u64; - // TEMPORARILY DISABLED until https://github.com/FuelLabs/fuels-rs/issues/201 is resolved. - //fuelcoin_instance - // .force_transfer_coins(coins, asset_id.clone(), target.clone()) - // .set_contracts(&[fuelcoin_id, balance_id]) - // .call() - // .await - // .unwrap(); + fuelcoin_instance + .force_transfer_coins(coins, asset_id.clone(), target.clone()) + .set_contracts(&[fuelcoin_id, balance_id]) + .call() + .await + .unwrap(); // confirm remaining balance on fuelcoin contract balance_result = fuelcoin_instance @@ -124,8 +120,7 @@ async fn can_force_transfer() { .call() .await .unwrap(); - // TEMPORARILY DISABLED until https://github.com/FuelLabs/fuels-rs/issues/201 is resolved. - //assert_eq!(balance_result.value, 58); + assert_eq!(balance_result.value, 58); // confirm new balance on balance contract (recipient) balance_result = fuelcoin_instance @@ -134,8 +129,7 @@ async fn can_force_transfer() { .call() .await .unwrap(); - // TEMPORARILY DISABLED until https://github.com/FuelLabs/fuels-rs/issues/201 is resolved. - //assert_eq!(balance_result.value, 42); + assert_eq!(balance_result.value, 42); } #[tokio::test] diff --git a/sway-lib-std/tests/test_projects/tx_fields/mod.rs b/sway-lib-std/tests/test_projects/tx_fields/mod.rs index 31f65d31def..4845947e465 100644 --- a/sway-lib-std/tests/test_projects/tx_fields/mod.rs +++ b/sway-lib-std/tests/test_projects/tx_fields/mod.rs @@ -198,36 +198,35 @@ async fn can_get_script_start_offset() { #[tokio::test] async fn can_get_tx_input_type() { - // TEMPORARILY DISABLED until https://github.com/FuelLabs/fuels-rs/issues/201 is resolved. - //let (contract_instance, _, _) = get_contracts().await; - // - //// Contract input - //let input_type = 1; - //let result_ptr = contract_instance - // .get_tx_input_pointer(0) - // .call() - // .await - // .unwrap(); - //let result = contract_instance - // .get_tx_input_type(result_ptr.value) - // .call() - // .await - // .unwrap(); - //assert_eq!(result.value, input_type); - // - //// Coin input - //let input_type = 0; - //let result_ptr = contract_instance - // .get_tx_input_pointer(1) - // .call() - // .await - // .unwrap(); - //let result = contract_instance - // .get_tx_input_type(result_ptr.value) - // .call() - // .await - // .unwrap(); - //assert_eq!(result.value, input_type); + let (contract_instance, _, _) = get_contracts().await; + + // Contract input + let input_type = 1; + let result_ptr = contract_instance + .get_tx_input_pointer(0) + .call() + .await + .unwrap(); + let result = contract_instance + .get_tx_input_type(result_ptr.value) + .call() + .await + .unwrap(); + assert_eq!(result.value, input_type); + + // Coin input + let input_type = 0; + let result_ptr = contract_instance + .get_tx_input_pointer(1) + .call() + .await + .unwrap(); + let result = contract_instance + .get_tx_input_type(result_ptr.value) + .call() + .await + .unwrap(); + assert_eq!(result.value, input_type); } #[tokio::test] @@ -238,50 +237,48 @@ async fn can_get_tx_input_coin_owner() { let input_owner = txcontracttest_mod::Address { value: wallet.address().into(), }; - // TEMPORARILY DISABLED until https://github.com/FuelLabs/fuels-rs/issues/201 is resolved. - //let result_ptr = contract_instance - // .get_tx_input_pointer(1) - // .call() - // .await - // .unwrap(); - //let result = contract_instance - // .get_tx_input_coin_owner(result_ptr.value) - // .call() - // .await - // .unwrap(); - //assert_eq!(result.value, input_owner); + let result_ptr = contract_instance + .get_tx_input_pointer(1) + .call() + .await + .unwrap(); + let result = contract_instance + .get_tx_input_coin_owner(result_ptr.value) + .call() + .await + .unwrap(); + assert_eq!(result.value, input_owner); } #[tokio::test] async fn can_get_tx_output_type() { - // TEMPORARILY DISABLED until https://github.com/FuelLabs/fuels-rs/issues/201 is resolved. - //let (contract_instance, _, _) = get_contracts().await; - // - //// Contract output - //let output_type = 1; - //let result_ptr = contract_instance - // .get_tx_output_pointer(1) - // .call() - // .await - // .unwrap(); - //let result = contract_instance - // .get_tx_output_type(result_ptr.value) - // .call() - // .await - // .unwrap(); - //assert_eq!(result.value, output_type); - // - //// Change output - //let output_type = 3; - //let result_ptr = contract_instance - // .get_tx_output_pointer(0) - // .call() - // .await - // .unwrap(); - //let result = contract_instance - // .get_tx_output_type(result_ptr.value) - // .call() - // .await - // .unwrap(); - //assert_eq!(result.value, output_type); + let (contract_instance, _, _) = get_contracts().await; + + // Contract output + let output_type = 1; + let result_ptr = contract_instance + .get_tx_output_pointer(1) + .call() + .await + .unwrap(); + let result = contract_instance + .get_tx_output_type(result_ptr.value) + .call() + .await + .unwrap(); + assert_eq!(result.value, output_type); + + // Change output + let output_type = 3; + let result_ptr = contract_instance + .get_tx_output_pointer(0) + .call() + .await + .unwrap(); + let result = contract_instance + .get_tx_output_type(result_ptr.value) + .call() + .await + .unwrap(); + assert_eq!(result.value, output_type); }