Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix ISE when creating fuel tanks #20

Merged
merged 2 commits into from
Nov 9, 2023
Merged

Fix ISE when creating fuel tanks #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
848d097
Check for null values
enjinabner Nov 9, 2023
859729f
Update tests
enjinabner Nov 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/GraphQL/Mutations/CreateFuelTankMutation.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() ?? [],
],
];
}
Expand Down
6 changes: 3 additions & 3 deletions src/Services/Blockchain/Implemetations/Substrate.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'))
Expand Down
15 changes: 15 additions & 0 deletions tests/Feature/GraphQL/Mutations/CreateFuelTankTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
8 changes: 4 additions & 4 deletions tests/Feature/GraphQL/Traits/GenerateFuelTankData.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand All @@ -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'],
];

Expand Down