Fix ISE when creating fuel tanks (#20) (#21)

enjin · Nov 9, 2023 · 805ba2b · 805ba2b
1 parent 38b671b
commit 805ba2b
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 8 deletions.
diff --git a/src/GraphQL/Mutations/CreateFuelTankMutation.php b/src/GraphQL/Mutations/CreateFuelTankMutation.php
@@ -125,7 +125,7 @@ public static function getEncodableParams(...$params): array
                 'userAccountManagement' => $userAccountManagement?->toEncodable(),
                 'ruleSets' => $ruleSets->map(fn ($ruleSet) => $ruleSet->toEncodable())->toArray(),
                 'providesDeposit' => $providesDeposit,
-                'accountRules' => $accountRules?->toEncodable(),
+                'accountRules' => $accountRules?->toEncodable() ?? [],
             ],
         ];
     }

diff --git a/src/Services/Blockchain/Implemetations/Substrate.php b/src/Services/Blockchain/Implemetations/Substrate.php
@@ -59,13 +59,13 @@ public function getDispatchRulesParams(array $args): DispatchRulesParams
             ($collections = Arr::get($args, 'whitelistedCollections'))
                 ? new WhitelistedCollectionsParams($collections)
                 : null,
-            ($maxFuelBurnPerTransaction = Arr::get($args, 'maxFuelBurnPerTransaction'))
+            (!is_null($maxFuelBurnPerTransaction = Arr::get($args, 'maxFuelBurnPerTransaction')))
                 ? new MaxFuelBurnPerTransactionParams($maxFuelBurnPerTransaction)
                 : null,
-            ($userFuelBudget = Arr::get($args, 'userFuelBudget'))
+            (!is_null($userFuelBudget = Arr::get($args, 'userFuelBudget')))
                 ? new UserFuelBudgetParams(Arr::get($userFuelBudget, 'amount'), Arr::get($userFuelBudget, 'resetPeriod'))
                 : null,
-            ($tankFuelBudget = Arr::get($args, 'tankFuelBudget'))
+            (!is_null($tankFuelBudget = Arr::get($args, 'tankFuelBudget')))
                 ? new TankFuelBudgetParams(Arr::get($tankFuelBudget, 'amount'), Arr::get($tankFuelBudget, 'resetPeriod'))
                 : null,
             ($permittedCalls = Arr::get($args, 'permittedCalls'))

diff --git a/tests/Feature/GraphQL/Mutations/CreateFuelTankTest.php b/tests/Feature/GraphQL/Mutations/CreateFuelTankTest.php
@@ -32,6 +32,21 @@ public function test_it_can_create_fuel_tank(): void
         );
     }
 
+    public function test_it_can_create_fuel_tank_with_zero_values(): void
+    {
+        $response = $this->graphql($this->method, $data = $this->generateData(true, 0));
+
+        $blockchainService = resolve(Substrate::class);
+        $data['userAccountManagement'] = $blockchainService->getUserAccountManagementParams($data);
+        $data['dispatchRules'] = $blockchainService->getDispatchRulesParamsArray($data);
+        $data['accountRules'] = $blockchainService->getAccountRulesParams($data);
+
+        $this->assertEquals(
+            $response['encodedData'],
+            TransactionSerializer::encode($this->method, CreateFuelTankMutation::getEncodableParams(...$data))
+        );
+    }
+
     public function test_it_will_fail_with_invalid_parameter_name(): void
     {
         $data = $this->generateData();

diff --git a/tests/Feature/GraphQL/Traits/GenerateFuelTankData.php b/tests/Feature/GraphQL/Traits/GenerateFuelTankData.php
@@ -9,7 +9,7 @@ trait GenerateFuelTankData
     /**
      * Generate data.
      */
-    protected function generateData($isArray = true): array
+    protected function generateData($isArray = true, $value = null): array
     {
         $provider = resolve(SubstrateProvider::class);
 
@@ -20,9 +20,9 @@ protected function generateData($isArray = true): array
                 'tokenId' => ['integer' => $this->token->token_chain_id],
             ],
             'whitelistedCollections' => [$this->collection->collection_chain_id],
-            'maxFuelBurnPerTransaction' => fake()->numberBetween(1, 1000),
-            'userFuelBudget' => ['amount' => fake()->numberBetween(1, 1000), 'resetPeriod' => fake()->numberBetween(1, 1000)],
-            'tankFuelBudget' => ['amount' => fake()->numberBetween(1, 1000), 'resetPeriod' => fake()->numberBetween(1, 1000)],
+            'maxFuelBurnPerTransaction' => $value ?? fake()->numberBetween(1, 1000),
+            'userFuelBudget' => ['amount' => $value ?? fake()->numberBetween(1, 1000), 'resetPeriod' => fake()->numberBetween(1, 1000)],
+            'tankFuelBudget' => ['amount' => $value ?? fake()->numberBetween(1, 1000), 'resetPeriod' => fake()->numberBetween(1, 1000)],
             'permittedExtrinsics' => ['CreateCollection', 'ApproveCollection', 'SimpleTransferToken', 'OperatorTransferToken'],
         ];