git.delta.rocks / unique-network / refs/commits / 296b31494b12

difftreelog

chore generate stubs

PraetorP2022-12-14parent: #3f089fc.patch.diff
in: master

9 files changed

modifiedpallets/fungible/src/stubs/UniqueFungible.soldiffbeforeafterboth
--- 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;
 }
modifiedpallets/nonfungible/src/stubs/UniqueNFT.soldiffbeforeafterboth
--- 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
modifiedpallets/refungible/src/stubs/UniqueRefungible.soldiffbeforeafterboth
422	/// Returns nesting for a collection422	/// Returns nesting for a collection
423	/// @dev EVM selector for this function is: 0x22d25bfe,423	/// @dev EVM selector for this function is: 0x22d25bfe,
424	///  or in textual repr: collectionNestingRestrictedCollectionIds()424	///  or in textual repr: collectionNestingRestrictedCollectionIds()
425<<<<<<< HEAD
425	function collectionNestingRestrictedCollectionIds() public view returns (Tuple38 memory) {426	function collectionNestingRestrictedCollectionIds() public view returns (Tuple38 memory) {
426		require(false, stub_error);427		require(false, stub_error);
427		dummy;428		dummy;
428		return Tuple38(false, new uint256[](0));429		return Tuple38(false, new uint256[](0));
430=======
431	function collectionNestingRestrictedCollectionIds() public view returns (Tuple35 memory) {
432		require(false, stub_error);
433		dummy;
434		return Tuple35(false, new uint256[](0));
435>>>>>>> 09f69700... chore: generate stubs
429	}436	}
430437
431	/// Returns permissions for a collection438	/// Returns permissions for a collection
432	/// @dev EVM selector for this function is: 0x5b2eaf4b,439	/// @dev EVM selector for this function is: 0x5b2eaf4b,
433	///  or in textual repr: collectionNestingPermissions()440	///  or in textual repr: collectionNestingPermissions()
441<<<<<<< HEAD
434	function collectionNestingPermissions() public view returns (Tuple41[] memory) {442	function collectionNestingPermissions() public view returns (Tuple41[] memory) {
435		require(false, stub_error);443		require(false, stub_error);
436		dummy;444		dummy;
437		return new Tuple41[](0);445		return new Tuple41[](0);
446=======
447	function collectionNestingPermissions() public view returns (Tuple38[] memory) {
448		require(false, stub_error);
449		dummy;
450		return new Tuple38[](0);
451>>>>>>> 09f69700... chore: generate stubs
438	}452	}
439453
440	/// Set the collection access method.454	/// Set the collection access method.
614}628}
615629
616/// @dev anonymous struct630/// @dev anonymous struct
631<<<<<<< HEAD
617struct Tuple41 {632struct Tuple41 {
633=======
634struct Tuple38 {
635>>>>>>> 09f69700... chore: generate stubs
618	CollectionPermissions field_0;636	CollectionPermissions field_0;
619	bool field_1;637	bool field_1;
620}638}
621639
622/// @dev anonymous struct640/// @dev anonymous struct
641<<<<<<< HEAD
623struct Tuple38 {642struct Tuple38 {
643=======
644struct Tuple35 {
645>>>>>>> 09f69700... chore: generate stubs
624	bool field_0;646	bool field_0;
625	uint256[] field_1;647	uint256[] field_1;
626}648}
627649
650<<<<<<< HEAD
628/// @dev [`CollectionLimits`](up_data_structs::CollectionLimits) representation for EVM.651/// @dev [`CollectionLimits`](up_data_structs::CollectionLimits) representation for EVM.
629enum CollectionLimits {652enum CollectionLimits {
630	/// @dev How many tokens can a user have on one account.653	/// @dev How many tokens can a user have on one account.
660	uint256 field_1;683	uint256 field_1;
661}684}
662685
686=======
687>>>>>>> 09f69700... chore: generate stubs
663/// @dev the ERC-165 identifier for this interface is 0x5b5e139f688/// @dev the ERC-165 identifier for this interface is 0x5b5e139f
664contract ERC721Metadata is Dummy, ERC165 {689contract ERC721Metadata is Dummy, ERC165 {
665	// /// @notice A descriptive name for a collection of NFTs in this contract690	// /// @notice A descriptive name for a collection of NFTs in this contract
modifiedtests/src/eth/abi/fungible.jsondiffbeforeafterboth
--- 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"
       }
modifiedtests/src/eth/abi/nonFungible.jsondiffbeforeafterboth
--- 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"
       }
modifiedtests/src/eth/abi/reFungible.jsondiffbeforeafterboth
--- 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"
       }
modifiedtests/src/eth/api/UniqueFungible.soldiffbeforeafterboth
--- 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;
 }
modifiedtests/src/eth/api/UniqueNFT.soldiffbeforeafterboth
--- 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
modifiedtests/src/eth/api/UniqueRefungible.soldiffbeforeafterboth
--- 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