From 8470621428d102627acc3cfdd7ca488f10164a31 Mon Sep 17 00:00:00 2001
From: Nick Furfaro <nfurfaro33@gmail.com>
Date: Thu, 3 Mar 2022 15:47:45 -0700
Subject: [PATCH] Fix return types of context::contract_id &
 context::msg_asset_id (#59)

* style:fix weird forc fmt issue

* fix:correct the return type for context module funcs

* test:add contract and json abi file

* test:add module to harness

* build:add manifest file

* test:add tests for context module

* style:forc fmt

* style:cargo fmt

* style:formatting

* fix:remove context test_project, coming in follow-up PR

* style:forc fmt
---
 src/context.sw                            | 17 +++++++++--------
 tests/test_projects/token_ops/src/main.sw |  2 +-
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/context.sw b/src/context.sw
index da209a21e40..d146e10440f 100644
--- a/src/context.sw
+++ b/src/context.sw
@@ -6,16 +6,17 @@ use ::contract_id::ContractId;
 /// Get the current contract's id when called in an internal context.
 /// **Note !** If called in an external context, this will **not** return a contract ID.
 // @dev If called externally, will actually return a pointer to the transaction ID.
-pub fn contract_id() -> b256 {
-    asm() {
+pub fn contract_id() -> ContractId {
+    ~ContractId::from(asm() {
         fp: b256
-    }
+    })
 }
 
 /// Get the current contracts balance of coin `asset_id`
 pub fn this_balance(asset_id: b256) -> u64 {
-    asm(balance, token: asset_id) {
-        bal balance token fp;
+    let this_id = contract_id();
+    asm(balance, token: asset_id, contract_id: this_id) {
+        bal balance token contract_id;
         balance: u64
     }
 }
@@ -36,11 +37,11 @@ pub fn msg_amount() -> u64 {
 }
 
 /// Get the asset_id of coins being sent.
-pub fn msg_asset_id() -> b256 {
-    asm(asset_id) {
+pub fn msg_asset_id() -> ContractId {
+    ~ContractId::from(asm(asset_id) {
         addi asset_id fp i32;
         asset_id: b256
-    }
+    })
 }
 
 /// Get the remaining gas in the context.
diff --git a/tests/test_projects/token_ops/src/main.sw b/tests/test_projects/token_ops/src/main.sw
index 5abd3d20291..48bad07462a 100644
--- a/tests/test_projects/token_ops/src/main.sw
+++ b/tests/test_projects/token_ops/src/main.sw
@@ -1,6 +1,6 @@
 contract;
 
----------use std::{address::Address,contract_id::ContractId,token::*,context::balance_of_contract};
+use std::{address::Address, context::balance_of_contract, contract_id::ContractId, token::*};
 
 /// Parameters for `force_transfer` function.
 pub struct ParamsForceTransfer {