From 296b31494b1245434f3ea65dc31af3379711a194 Mon Sep 17 00:00:00 2001 From: PraetorP Date: Wed, 14 Dec 2022 14:52:55 +0000 Subject: [PATCH] chore: generate stubs --- --- a/pallets/fungible/src/stubs/UniqueFungible.sol +++ b/pallets/fungible/src/stubs/UniqueFungible.sol @@ -284,19 +284,33 @@ /// Returns nesting for a collection /// @dev EVM selector for this function is: 0x22d25bfe, /// or in textual repr: collectionNestingRestrictedCollectionIds() +<<<<<<< HEAD function collectionNestingRestrictedCollectionIds() public view returns (Tuple26 memory) { require(false, stub_error); dummy; return Tuple26(false, new uint256[](0)); +======= + function collectionNestingRestrictedCollectionIds() public view returns (Tuple24 memory) { + require(false, stub_error); + dummy; + return Tuple24(false, new uint256[](0)); +>>>>>>> 09f69700... chore: generate stubs } /// Returns permissions for a collection /// @dev EVM selector for this function is: 0x5b2eaf4b, /// or in textual repr: collectionNestingPermissions() +<<<<<<< HEAD function collectionNestingPermissions() public view returns (Tuple29[] memory) { require(false, stub_error); dummy; return new Tuple29[](0); +======= + function collectionNestingPermissions() public view returns (Tuple27[] memory) { + require(false, stub_error); + dummy; + return new Tuple27[](0); +>>>>>>> 09f69700... chore: generate stubs } /// Set the collection access method. @@ -476,13 +490,21 @@ } /// @dev anonymous struct +<<<<<<< HEAD struct Tuple29 { +======= +struct Tuple27 { +>>>>>>> 09f69700... chore: generate stubs CollectionPermissions field_0; bool field_1; } /// @dev anonymous struct +<<<<<<< HEAD struct Tuple26 { +======= +struct Tuple24 { +>>>>>>> 09f69700... chore: generate stubs bool field_0; uint256[] field_1; } --- a/pallets/nonfungible/src/stubs/UniqueNFT.sol +++ b/pallets/nonfungible/src/stubs/UniqueNFT.sol @@ -422,19 +422,33 @@ /// Returns nesting for a collection /// @dev EVM selector for this function is: 0x22d25bfe, /// or in textual repr: collectionNestingRestrictedCollectionIds() +<<<<<<< HEAD function collectionNestingRestrictedCollectionIds() public view returns (Tuple39 memory) { require(false, stub_error); dummy; return Tuple39(false, new uint256[](0)); +======= + function collectionNestingRestrictedCollectionIds() public view returns (Tuple36 memory) { + require(false, stub_error); + dummy; + return Tuple36(false, new uint256[](0)); +>>>>>>> 09f69700... chore: generate stubs } /// Returns permissions for a collection /// @dev EVM selector for this function is: 0x5b2eaf4b, /// or in textual repr: collectionNestingPermissions() +<<<<<<< HEAD function collectionNestingPermissions() public view returns (Tuple42[] memory) { require(false, stub_error); dummy; return new Tuple42[](0); +======= + function collectionNestingPermissions() public view returns (Tuple39[] memory) { + require(false, stub_error); + dummy; + return new Tuple39[](0); +>>>>>>> 09f69700... chore: generate stubs } /// Set the collection access method. @@ -608,24 +622,32 @@ uint256 sub; } -<<<<<<< HEAD enum CollectionPermissions { CollectionAdmin, TokenOwner } /// @dev anonymous struct +<<<<<<< HEAD struct Tuple42 { +======= +struct Tuple39 { +>>>>>>> 09f69700... chore: generate stubs CollectionPermissions field_0; bool field_1; } /// @dev anonymous struct +<<<<<<< HEAD struct Tuple39 { +======= +struct Tuple36 { +>>>>>>> 09f69700... chore: generate stubs bool field_0; uint256[] field_1; } +<<<<<<< HEAD /// @dev [`CollectionLimits`](up_data_structs::CollectionLimits) representation for EVM. enum CollectionLimits { /// @dev How many tokens can a user have on one account. @@ -663,6 +685,8 @@ ======= >>>>>>> 0bf15e6f... fixed tests&tuple instead of struct, refactored `refungible` pallet +======= +>>>>>>> 09f69700... chore: generate stubs /// @title ERC-721 Non-Fungible Token Standard, optional metadata extension /// @dev See https://eips.ethereum.org/EIPS/eip-721 /// @dev the ERC-165 identifier for this interface is 0x5b5e139f --- a/pallets/refungible/src/stubs/UniqueRefungible.sol +++ b/pallets/refungible/src/stubs/UniqueRefungible.sol @@ -422,19 +422,33 @@ /// Returns nesting for a collection /// @dev EVM selector for this function is: 0x22d25bfe, /// or in textual repr: collectionNestingRestrictedCollectionIds() +<<<<<<< HEAD function collectionNestingRestrictedCollectionIds() public view returns (Tuple38 memory) { require(false, stub_error); dummy; return Tuple38(false, new uint256[](0)); +======= + function collectionNestingRestrictedCollectionIds() public view returns (Tuple35 memory) { + require(false, stub_error); + dummy; + return Tuple35(false, new uint256[](0)); +>>>>>>> 09f69700... chore: generate stubs } /// Returns permissions for a collection /// @dev EVM selector for this function is: 0x5b2eaf4b, /// or in textual repr: collectionNestingPermissions() +<<<<<<< HEAD function collectionNestingPermissions() public view returns (Tuple41[] memory) { require(false, stub_error); dummy; return new Tuple41[](0); +======= + function collectionNestingPermissions() public view returns (Tuple38[] memory) { + require(false, stub_error); + dummy; + return new Tuple38[](0); +>>>>>>> 09f69700... chore: generate stubs } /// Set the collection access method. @@ -614,17 +628,26 @@ } /// @dev anonymous struct +<<<<<<< HEAD struct Tuple41 { +======= +struct Tuple38 { +>>>>>>> 09f69700... chore: generate stubs CollectionPermissions field_0; bool field_1; } /// @dev anonymous struct +<<<<<<< HEAD struct Tuple38 { +======= +struct Tuple35 { +>>>>>>> 09f69700... chore: generate stubs bool field_0; uint256[] field_1; } +<<<<<<< HEAD /// @dev [`CollectionLimits`](up_data_structs::CollectionLimits) representation for EVM. enum CollectionLimits { /// @dev How many tokens can a user have on one account. @@ -660,6 +683,8 @@ uint256 field_1; } +======= +>>>>>>> 09f69700... chore: generate stubs /// @dev the ERC-165 identifier for this interface is 0x5b5e139f contract ERC721Metadata is Dummy, ERC165 { // /// @notice A descriptive name for a collection of NFTs in this contract --- a/tests/src/eth/abi/fungible.json +++ b/tests/src/eth/abi/fungible.json @@ -241,7 +241,11 @@ }, { "internalType": "bool", "name": "field_1", "type": "bool" } ], +<<<<<<< HEAD "internalType": "struct Tuple29[]", +======= + "internalType": "struct Tuple27[]", +>>>>>>> 09f69700... chore: generate stubs "name": "", "type": "tuple[]" } @@ -262,7 +266,11 @@ "type": "uint256[]" } ], +<<<<<<< HEAD "internalType": "struct Tuple26", +======= + "internalType": "struct Tuple24", +>>>>>>> 09f69700... chore: generate stubs "name": "", "type": "tuple" } --- a/tests/src/eth/abi/nonFungible.json +++ b/tests/src/eth/abi/nonFungible.json @@ -271,7 +271,11 @@ }, { "internalType": "bool", "name": "field_1", "type": "bool" } ], +<<<<<<< HEAD "internalType": "struct Tuple42[]", +======= + "internalType": "struct Tuple39[]", +>>>>>>> 09f69700... chore: generate stubs "name": "", "type": "tuple[]" } @@ -292,7 +296,11 @@ "type": "uint256[]" } ], +<<<<<<< HEAD "internalType": "struct Tuple39", +======= + "internalType": "struct Tuple36", +>>>>>>> 09f69700... chore: generate stubs "name": "", "type": "tuple" } --- a/tests/src/eth/abi/reFungible.json +++ b/tests/src/eth/abi/reFungible.json @@ -253,7 +253,11 @@ }, { "internalType": "bool", "name": "field_1", "type": "bool" } ], +<<<<<<< HEAD "internalType": "struct Tuple41[]", +======= + "internalType": "struct Tuple38[]", +>>>>>>> 09f69700... chore: generate stubs "name": "", "type": "tuple[]" } @@ -274,7 +278,11 @@ "type": "uint256[]" } ], +<<<<<<< HEAD "internalType": "struct Tuple38", +======= + "internalType": "struct Tuple35", +>>>>>>> 09f69700... chore: generate stubs "name": "", "type": "tuple" } --- a/tests/src/eth/api/UniqueFungible.sol +++ b/tests/src/eth/api/UniqueFungible.sol @@ -191,12 +191,20 @@ /// Returns nesting for a collection /// @dev EVM selector for this function is: 0x22d25bfe, /// or in textual repr: collectionNestingRestrictedCollectionIds() +<<<<<<< HEAD function collectionNestingRestrictedCollectionIds() external view returns (Tuple24 memory); +======= + function collectionNestingRestrictedCollectionIds() external view returns (Tuple22 memory); +>>>>>>> 09f69700... chore: generate stubs /// Returns permissions for a collection /// @dev EVM selector for this function is: 0x5b2eaf4b, /// or in textual repr: collectionNestingPermissions() +<<<<<<< HEAD function collectionNestingPermissions() external view returns (Tuple27[] memory); +======= + function collectionNestingPermissions() external view returns (Tuple25[] memory); +>>>>>>> 09f69700... chore: generate stubs /// Set the collection access method. /// @param mode Access mode @@ -311,7 +319,11 @@ } /// @dev anonymous struct +<<<<<<< HEAD struct Tuple27 { +======= +struct Tuple25 { +>>>>>>> 09f69700... chore: generate stubs CollectionPermissions field_0; bool field_1; } @@ -322,7 +334,11 @@ } /// @dev anonymous struct +<<<<<<< HEAD struct Tuple24 { +======= +struct Tuple22 { +>>>>>>> 09f69700... chore: generate stubs bool field_0; uint256[] field_1; } --- a/tests/src/eth/api/UniqueNFT.sol +++ b/tests/src/eth/api/UniqueNFT.sol @@ -287,12 +287,20 @@ /// Returns nesting for a collection /// @dev EVM selector for this function is: 0x22d25bfe, /// or in textual repr: collectionNestingRestrictedCollectionIds() +<<<<<<< HEAD function collectionNestingRestrictedCollectionIds() external view returns (Tuple35 memory); +======= + function collectionNestingRestrictedCollectionIds() external view returns (Tuple32 memory); +>>>>>>> 09f69700... chore: generate stubs /// Returns permissions for a collection /// @dev EVM selector for this function is: 0x5b2eaf4b, /// or in textual repr: collectionNestingPermissions() +<<<<<<< HEAD function collectionNestingPermissions() external view returns (Tuple38[] memory); +======= + function collectionNestingPermissions() external view returns (Tuple35[] memory); +>>>>>>> 09f69700... chore: generate stubs /// Set the collection access method. /// @param mode Access mode @@ -406,9 +414,12 @@ uint256 sub; } +/// @dev anonymous struct <<<<<<< HEAD -/// @dev anonymous struct struct Tuple38 { +======= +struct Tuple35 { +>>>>>>> 09f69700... chore: generate stubs CollectionPermissions field_0; bool field_1; } @@ -419,11 +430,16 @@ } /// @dev anonymous struct +<<<<<<< HEAD struct Tuple35 { +======= +struct Tuple32 { +>>>>>>> 09f69700... chore: generate stubs bool field_0; uint256[] field_1; } +<<<<<<< HEAD /// @dev [`CollectionLimits`](up_data_structs::CollectionLimits) representation for EVM. enum CollectionLimits { /// @dev How many tokens can a user have on one account. @@ -461,6 +477,8 @@ ======= >>>>>>> 0bf15e6f... fixed tests&tuple instead of struct, refactored `refungible` pallet +======= +>>>>>>> 09f69700... chore: generate stubs /// @title ERC-721 Non-Fungible Token Standard, optional metadata extension /// @dev See https://eips.ethereum.org/EIPS/eip-721 /// @dev the ERC-165 identifier for this interface is 0x5b5e139f --- a/tests/src/eth/api/UniqueRefungible.sol +++ b/tests/src/eth/api/UniqueRefungible.sol @@ -287,12 +287,20 @@ /// Returns nesting for a collection /// @dev EVM selector for this function is: 0x22d25bfe, /// or in textual repr: collectionNestingRestrictedCollectionIds() +<<<<<<< HEAD function collectionNestingRestrictedCollectionIds() external view returns (Tuple34 memory); +======= + function collectionNestingRestrictedCollectionIds() external view returns (Tuple31 memory); +>>>>>>> 09f69700... chore: generate stubs /// Returns permissions for a collection /// @dev EVM selector for this function is: 0x5b2eaf4b, /// or in textual repr: collectionNestingPermissions() +<<<<<<< HEAD function collectionNestingPermissions() external view returns (Tuple37[] memory); +======= + function collectionNestingPermissions() external view returns (Tuple34[] memory); +>>>>>>> 09f69700... chore: generate stubs /// Set the collection access method. /// @param mode Access mode @@ -406,9 +414,12 @@ uint256 sub; } +/// @dev anonymous struct <<<<<<< HEAD -/// @dev anonymous struct struct Tuple37 { +======= +struct Tuple34 { +>>>>>>> 09f69700... chore: generate stubs CollectionPermissions field_0; bool field_1; } @@ -419,11 +430,16 @@ } /// @dev anonymous struct +<<<<<<< HEAD struct Tuple34 { +======= +struct Tuple31 { +>>>>>>> 09f69700... chore: generate stubs bool field_0; uint256[] field_1; } +<<<<<<< HEAD /// @dev [`CollectionLimits`](up_data_structs::CollectionLimits) representation for EVM. enum CollectionLimits { /// @dev How many tokens can a user have on one account. @@ -461,6 +477,8 @@ ======= >>>>>>> 0bf15e6f... fixed tests&tuple instead of struct, refactored `refungible` pallet +======= +>>>>>>> 09f69700... chore: generate stubs /// @dev the ERC-165 identifier for this interface is 0x5b5e139f interface ERC721Metadata is Dummy, ERC165 { // /// @notice A descriptive name for a collection of NFTs in this contract -- gitstuff