fix rebase issues

FuelLabs · Jun 22, 2024 · 51fa76d · 51fa76d
1 parent 085e75b
commit 51fa76d
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 76 deletions.
diff --git a/.../test_programs/should_pass/language/configurable_consts/json_abi_oracle_new_encoding.json b/.../test_programs/should_pass/language/configurable_consts/json_abi_oracle_new_encoding.json
@@ -7,11 +7,7 @@
         "typeArguments": null
       },
       "name": "BOOL",
-<<<<<<< HEAD
-      "offset": 6848
-=======
-      "offset": 6936
->>>>>>> ef917df9a (fix Vec buffer ownership)
+      "offset": 6856
     },
     {
       "configurableType": {
@@ -20,11 +16,7 @@
         "typeArguments": null
       },
       "name": "U8",
-<<<<<<< HEAD
-      "offset": 6984
-=======
-      "offset": 7072
->>>>>>> ef917df9a (fix Vec buffer ownership)
+      "offset": 6992
     },
     {
       "configurableType": {
@@ -33,11 +25,7 @@
         "typeArguments": null
       },
       "name": "ANOTHER_U8",
-<<<<<<< HEAD
-      "offset": 6776
-=======
-      "offset": 6864
->>>>>>> ef917df9a (fix Vec buffer ownership)
+      "offset": 6784
     },
     {
       "configurableType": {
@@ -46,11 +34,7 @@
         "typeArguments": null
       },
       "name": "U16",
-<<<<<<< HEAD
-      "offset": 6928
-=======
-      "offset": 7016
->>>>>>> ef917df9a (fix Vec buffer ownership)
+      "offset": 6936
     },
     {
       "configurableType": {
@@ -59,11 +43,7 @@
         "typeArguments": null
       },
       "name": "U32",
-<<<<<<< HEAD
-      "offset": 6968
-=======
-      "offset": 7056
->>>>>>> ef917df9a (fix Vec buffer ownership)
+      "offset": 6976
     },
     {
       "configurableType": {
@@ -72,11 +52,7 @@
         "typeArguments": null
       },
       "name": "U64",
-<<<<<<< HEAD
-      "offset": 6976
-=======
-      "offset": 7064
->>>>>>> ef917df9a (fix Vec buffer ownership)
+      "offset": 6984
     },
     {
       "configurableType": {
@@ -85,11 +61,7 @@
         "typeArguments": null
       },
       "name": "U256",
-<<<<<<< HEAD
-      "offset": 6936
-=======
-      "offset": 7024
->>>>>>> ef917df9a (fix Vec buffer ownership)
+      "offset": 6944
     },
     {
       "configurableType": {
@@ -98,11 +70,7 @@
         "typeArguments": null
       },
       "name": "B256",
-<<<<<<< HEAD
-      "offset": 6816
-=======
-      "offset": 6904
->>>>>>> ef917df9a (fix Vec buffer ownership)
+      "offset": 6824
     },
     {
       "configurableType": {
@@ -111,11 +79,7 @@
         "typeArguments": []
       },
       "name": "CONFIGURABLE_STRUCT",
-<<<<<<< HEAD
-      "offset": 6888
-=======
-      "offset": 6976
->>>>>>> ef917df9a (fix Vec buffer ownership)
+      "offset": 6896
     },
     {
       "configurableType": {
@@ -124,11 +88,7 @@
         "typeArguments": []
       },
       "name": "CONFIGURABLE_ENUM_A",
-<<<<<<< HEAD
-      "offset": 6856
-=======
-      "offset": 6944
->>>>>>> ef917df9a (fix Vec buffer ownership)
+      "offset": 6864
     },
     {
       "configurableType": {
@@ -137,11 +97,7 @@
         "typeArguments": []
       },
       "name": "CONFIGURABLE_ENUM_B",
-<<<<<<< HEAD
-      "offset": 6872
-=======
-      "offset": 6960
->>>>>>> ef917df9a (fix Vec buffer ownership)
+      "offset": 6880
     },
     {
       "configurableType": {
@@ -150,11 +106,7 @@
         "typeArguments": null
       },
       "name": "ARRAY_BOOL",
-<<<<<<< HEAD
-      "offset": 6784
-=======
-      "offset": 6872
->>>>>>> ef917df9a (fix Vec buffer ownership)
+      "offset": 6792
     },
     {
       "configurableType": {
@@ -163,11 +115,7 @@
         "typeArguments": null
       },
       "name": "ARRAY_U64",
-<<<<<<< HEAD
-      "offset": 6792
-=======
-      "offset": 6880
->>>>>>> ef917df9a (fix Vec buffer ownership)
+      "offset": 6800
     },
     {
       "configurableType": {
@@ -176,11 +124,7 @@
         "typeArguments": null
       },
       "name": "TUPLE_BOOL_U64",
-<<<<<<< HEAD
-      "offset": 6912
-=======
-      "offset": 7000
->>>>>>> ef917df9a (fix Vec buffer ownership)
+      "offset": 6920
     },
     {
       "configurableType": {
@@ -189,11 +133,7 @@
         "typeArguments": null
       },
       "name": "STR_4",
-<<<<<<< HEAD
-      "offset": 6904
-=======
-      "offset": 6992
->>>>>>> ef917df9a (fix Vec buffer ownership)
+      "offset": 6912
     }
   ],
   "encoding": "1",

diff --git a/...ests/test_programs/should_pass/require_contract_deployment/call_basic_storage/src/main.sw b/...ests/test_programs/should_pass/require_contract_deployment/call_basic_storage/src/main.sw
@@ -4,7 +4,7 @@ use basic_storage_abi::{BasicStorage, Quad};
 #[cfg(experimental_new_encoding = false)]
 const CONTRACT_ID = 0x044ab65bcabeebb73c88d8625ce392224c613cb1dae21ebedaa36bf6db1f5f4e;
 #[cfg(experimental_new_encoding = true)]
-const CONTRACT_ID = 0xc98486039347d1f5fa68e3c557565aa8da0b9ca1b74207404e64e50afe0766c9;
+const CONTRACT_ID = 0xe82914343e787908e5661aeaea720e48248f9d99e14d57677936164fbda70f69;
 
 fn main() -> u64 {
     let addr = abi(BasicStorage, CONTRACT_ID);