Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
3bc5c51
commit de04217
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,18 @@ | ||
| // deno-lint-ignore-file prefer-const ban-ts-comment no-explicit-any no-namespace | ||
|
|
||
| import { | ||
| ExpectFungibleTokenBurnEvent, | ||
| ExpectFungibleTokenMintEvent, | ||
| ExpectFungibleTokenTransferEvent, | ||
| ExpectNonFungibleTokenBurnEvent, | ||
| ExpectNonFungibleTokenMintEvent, | ||
| ExpectNonFungibleTokenTransferEvent, | ||
| ExpectPrintEvent, | ||
| ExpectSTXTransferEvent, | ||
| } from "./types.ts"; | ||
|
|
||
| export * from "./types.ts"; | ||
|
|
||
| export class Tx { | ||
| type: number; | ||
| sender: string; | ||
|
|
@@ -427,46 +440,46 @@ declare global { | |
| amount: number | bigint, | ||
| sender: string, | ||
| recipient: string | ||
| ): ExpectSTXTransferEvent; | ||
| expectFungibleTokenTransferEvent( | ||
| amount: number | bigint, | ||
| sender: string, | ||
| recipient: string, | ||
| assetId: string | ||
| ): ExpectFungibleTokenTransferEvent; | ||
| expectFungibleTokenMintEvent( | ||
| amount: number | bigint, | ||
| recipient: string, | ||
| assetId: string | ||
| ): ExpectFungibleTokenMintEvent; | ||
| expectFungibleTokenBurnEvent( | ||
| amount: number | bigint, | ||
| sender: string, | ||
| assetId: string | ||
| ): ExpectFungibleTokenBurnEvent; | ||
| expectPrintEvent( | ||
| contractIdentifier: string, | ||
| value: string | ||
| ): ExpectPrintEvent; | ||
| expectNonFungibleTokenTransferEvent( | ||
| tokenId: string, | ||
| sender: string, | ||
| recipient: string, | ||
| assetAddress: string, | ||
| assetId: string | ||
| ): ExpectNonFungibleTokenTransferEvent; | ||
| expectNonFungibleTokenMintEvent( | ||
| tokenId: string, | ||
| recipient: string, | ||
| assetAddress: string, | ||
| assetId: string | ||
| ): ExpectNonFungibleTokenMintEvent; | ||
| expectNonFungibleTokenBurnEvent( | ||
| tokenId: string, | ||
| sender: string, | ||
| assetAddress: string, | ||
| assetId: string | ||
| ): ExpectNonFungibleTokenBurnEvent; | ||
| } | ||
| } | ||
|
|
||
|
|
@@ -665,45 +678,37 @@ String.prototype.expectTuple = function () { | |
| return tuple; | ||
| }; | ||
|
|
||
| Array.prototype.expectSTXTransferEvent = function (amount, sender, recipient) { | ||
| for (let { stx_transfer_event } of this) { | ||
| try { | ||
| return { | ||
| amount: stx_transfer_event.amount.expectInt(amount), | ||
| sender: stx_transfer_event.sender.expectPrincipal(sender), | ||
| recipient: stx_transfer_event.recipient.expectPrincipal(recipient), | ||
| }; | ||
| } catch (_error) { | ||
| continue; | ||
| } | ||
| } | ||
| throw new Error("Unable to retrieve expected STXTransferEvent"); | ||
| }; | ||
|
|
||
| Array.prototype.expectFungibleTokenTransferEvent = function ( | ||
| amount, | ||
| sender, | ||
| recipient, | ||
| assetId | ||
| ) { | ||
| for (let { ft_transfer_event } of this) { | ||
| try { | ||
| if (!ft_transfer_event.asset_identifier.endsWith(assetId)) continue; | ||
|
|
||
| return { | ||
| amount: ft_transfer_event.amount.expectInt(amount), | ||
| sender: ft_transfer_event.sender.expectPrincipal(sender), | ||
| recipient: ft_transfer_event.recipient.expectPrincipal(recipient), | ||
| assetId: ft_transfer_event.asset_identifier, | ||
| }; | ||
| } catch (_error) { | ||
| continue; | ||
| } | ||
|
|
@@ -716,175 +721,143 @@ Array.prototype.expectFungibleTokenTransferEvent = function ( | |
| }; | ||
|
|
||
| Array.prototype.expectFungibleTokenMintEvent = function ( | ||
| amount, | ||
| recipient, | ||
| assetId | ||
| ) { | ||
| for (let { ft_mint_event } of this) { | ||
| try { | ||
| if (!ft_mint_event.asset_identifier.endsWith(assetId)) continue; | ||
|
|
||
| return { | ||
| amount: ft_mint_event.amount.expectInt(amount), | ||
| recipient: ft_mint_event.recipient.expectPrincipal(recipient), | ||
| assetId: ft_mint_event.asset_identifier, | ||
| }; | ||
| } catch (_error) { | ||
| continue; | ||
| } | ||
| } | ||
| throw new Error("Unable to retrieve expected FungibleTokenMintEvent"); | ||
| }; | ||
|
|
||
| Array.prototype.expectFungibleTokenBurnEvent = function ( | ||
| amount, | ||
| sender, | ||
| assetId | ||
| ) { | ||
| for (let { ft_burn_event } of this) { | ||
| try { | ||
| if (!ft_burn_event.asset_identifier.endsWith(assetId)) continue; | ||
|
|
||
| return { | ||
| amount: ft_burn_event.amount.expectInt(amount), | ||
| sender: ft_burn_event.sender.expectPrincipal(sender), | ||
| assetId: ft_burn_event.asset_identifier, | ||
| }; | ||
| } catch (_error) { | ||
| continue; | ||
| } | ||
| } | ||
| throw new Error("Unable to retrieve expected FungibleTokenBurnEvent"); | ||
| }; | ||
|
|
||
| Array.prototype.expectPrintEvent = function (contractIdentifier, value) { | ||
| for (let { contract_event } of this) { | ||
This comment has been minimized.
Sorry, something went wrong.
This comment has been minimized.
Sorry, something went wrong.
hugocaillard
Author
Collaborator
|
||
| try { | ||
| if (!contract_event.topic.endsWith("print")) continue; | ||
| if (!contract_event.value.endsWith(value)) continue; | ||
|
|
||
| return { | ||
| contract_identifier: | ||
| contract_event.contract_identifier.expectPrincipal( | ||
| contractIdentifier | ||
| ), | ||
| topic: contract_event.topic, | ||
| value: contract_event.value, | ||
| }; | ||
| } catch (error) { | ||
| console.warn(error); | ||
| continue; | ||
| } | ||
| } | ||
| throw new Error("Unable to retrieve expected PrintEvent"); | ||
| }; | ||
|
|
||
| Array.prototype.expectNonFungibleTokenTransferEvent = function ( | ||
| tokenId, | ||
| sender, | ||
| recipient, | ||
| assetAddress, | ||
| assetId | ||
| ) { | ||
| for (let { nft_transfer_event } of this) { | ||
| try { | ||
| if (nft_transfer_event.value !== tokenId) continue; | ||
| if (nft_transfer_event.asset_identifier !== `${assetAddress}::${assetId}`) | ||
| continue; | ||
|
|
||
| return { | ||
| tokenId: nft_transfer_event.value, | ||
| sender: nft_transfer_event.sender.expectPrincipal(sender), | ||
| recipient: nft_transfer_event.recipient.expectPrincipal(recipient), | ||
| assetId: nft_transfer_event.asset_identifier, | ||
| }; | ||
| } catch (_error) { | ||
| continue; | ||
| } | ||
| } | ||
| throw new Error("Unable to retrieve expected NonFungibleTokenTransferEvent"); | ||
| }; | ||
|
|
||
| Array.prototype.expectNonFungibleTokenMintEvent = function ( | ||
| tokenId, | ||
| recipient, | ||
| assetAddress, | ||
| assetId | ||
| ) { | ||
| for (let { nft_mint_event } of this) { | ||
| try { | ||
| if (nft_mint_event.value !== tokenId) continue; | ||
| if (nft_mint_event.asset_identifier !== `${assetAddress}::${assetId}`) | ||
| continue; | ||
|
|
||
| return { | ||
| tokenId: nft_mint_event.value, | ||
| recipient: nft_mint_event.recipient.expectPrincipal(recipient), | ||
| assetId: nft_mint_event.asset_identifier, | ||
| }; | ||
| } catch (_error) { | ||
| continue; | ||
| } | ||
| } | ||
| throw new Error("Unable to retrieve expected NonFungibleTokenMintEvent"); | ||
| }; | ||
|
|
||
| Array.prototype.expectNonFungibleTokenBurnEvent = function ( | ||
| tokenId, | ||
| sender, | ||
| assetAddress, | ||
| assetId | ||
| ) { | ||
| for (let event of this) { | ||
| try { | ||
| if (event.nft_burn_event.value !== tokenId) continue; | ||
| if ( | ||
| event.nft_burn_event.asset_identifier !== `${assetAddress}::${assetId}` | ||
| ) | ||
| continue; | ||
|
|
||
| return { | ||
| assetId: event.nft_burn_event.asset_identifier, | ||
| tokenId: event.nft_burn_event.value, | ||
| sender: event.nft_burn_event.sender.expectPrincipal(sender), | ||
| }; | ||
| } catch (_error) { | ||
| continue; | ||
| } | ||
| } | ||
| throw new Error("Unable to retrieve expected NonFungibleTokenBurnEvent"); | ||
| }; | ||
|
|
||
| const noColor = Deno.noColor ?? true; | ||
|
|
||
Oops, something went wrong.
As part of #398 that @Hookyns and I are working on, I was just running the fuzzer in various test-suites. One of them is citycoins/protocol.
This change appears to be a breaking one as it assumes that
thiscontains onlycontract_eventbut that's not always the case:Perhaps it makes sense to explicitly select the
contract_events, e.g.:I am not entirely sure if that makes sense, but at least it keeps our fuzz tests running, which is what we want, though I thought I should let you know. /cc @lgalabru @hugocaillard @whoabuddy