SystemRegistrationBuilder fixes

Nethereum · May 16, 2024 · 053f023 · 053f023
1 parent 24546cd
commit 053f023
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 22 deletions.
diff --git a/src/Nethereum.Mud.Contracts/Core/Systems/SystemRegistrationBuilder.cs b/src/Nethereum.Mud.Contracts/Core/Systems/SystemRegistrationBuilder.cs
@@ -44,7 +44,7 @@ public List<RegisterRootFunctionSelectorFunction> CreateRegisterRootFunctionSele
             {
                 excludedRegisteredSelectors.AddRange(new SystemDefaultFunctions().GetAllFunctionSignatures().ToList());
             }
-            excludedRegisteredSelectors.AddRange(new SystemDefaultFunctions().GetAllFunctionSignatures().ToList());
+
             var functionAbis = functionABIs;
             var functionSelectorsToRegister = functionAbis.Where(x => !excludedRegisteredSelectors.Any(y => y.IsTheSameHex(x.Sha3Signature))).ToList();
 
@@ -55,6 +55,7 @@ public List<RegisterRootFunctionSelectorFunction> CreateRegisterRootFunctionSele
                 registerFunction.SystemFunctionSignature = functionSelectorToRegister.Signature;
                 registerFunction.WorldFunctionSignature = functionSelectorToRegister.Signature;
                 registerFunction.SystemId = systemResourceId;
+                registerFunctionSelectors.Add(registerFunction);
             }
             return registerFunctionSelectors;
         }
@@ -73,7 +74,7 @@ public List<RegisterRootFunctionSelectorFunction> CreateRegisterFunctionSelector
             var registerSystemFunction = new RegisterSystemFunction();
             registerSystemFunction.SystemId = systemServiceResourceRegistration.Resource.ResourceIdEncoded;
             registerSystemFunction.System = deployedAddress;
-            registerSystemFunction.PublicAccess = true;
+            registerSystemFunction.PublicAccess = publicAccess;
             return registerSystemFunction;
         }
 

diff --git a/tests/Nethereum.Mud.IntegrationTests/WorldDeploymentTest.cs b/tests/Nethereum.Mud.IntegrationTests/WorldDeploymentTest.cs
@@ -231,14 +231,13 @@ public async Task ShouldDeployWorldContractRegisterTablesSystemAndInteractSimpli
             var registrationSystemService = world.Systems.RegistrationSystem;
             //TODO NAMESPACE registration in NamespaceService
 
-                var nameSpaceReceipt = registrationSystemService.RegisterNamespaceRequestAndWaitForReceiptAsync(
+              var nameSpaceReceipt = registrationSystemService.RegisterNamespaceRequestAndWaitForReceiptAsync(
                     ResourceEncoder.EncodeNamesapce(String.Empty));
 
 
 
             await mudTest.Tables.BatchRegisterAllTablesRequestAndWaitForReceiptAsync();
-
-           // await mudTest.Tables.BatchRegisterAllTablesRequestAndWaitForReceiptAsync();
+
 
             var tables = await store.Tables.TablesTableService.GetRecordsFromLogsAsync();
 
@@ -277,23 +276,8 @@ public async Task ShouldDeployWorldContractRegisterTablesSystemAndInteractSimpli
 
 
             var deployAllResult = await mudTest.Systems.DeployAllCreate2ContractSystemsRequestAsync(addressDeployer, salt);
-            try
-            {
-                var registerAllReceipt = await mudTest.Systems.BatchRegisterAllSystemsRequestAndWaitForReceiptAsync(addressDeployer, salt);
-            }
-            catch (SmartContractCustomErrorRevertException e)
-            {
-                var errorTypes = registrationSystemService.GetAllErrorTypes();
-                foreach (var errorType in errorTypes)
-                {
-                    if (e.IsCustomErrorFor(errorType))
-                    {
-                        Debug.WriteLine(errorType.ToString());
-                        throw;
-                    }
-                }
-
-            }
+            var registerAllReceipt = await mudTest.Systems.BatchRegisterAllSystemsRequestAndWaitForReceiptAsync(addressDeployer, salt);
+
             await mudTest.Systems.IncrementSystemService.IncrementRequestAndWaitForReceiptAsync();
 
             var counterRecord = await mudTest.Tables.CounterTableService.GetTableRecordAsync();