difftreelog
misk: small fix and some docks
in: master
4 files changed
crates/evm-coder/tests/abi_derive_generation.rsdiffbeforeafterboth--- a/crates/evm-coder/tests/abi_derive_generation.rs
+++ b/crates/evm-coder/tests/abi_derive_generation.rs
@@ -740,7 +740,7 @@
/// Some docs
/// At multi
/// line
- #[derive(AbiCoder, Debug, PartialEq, Default)]
+ #[derive(AbiCoder, Debug, PartialEq, Default, Clone, Copy)]
#[repr(u8)]
enum Color {
/// Docs for Red
pallets/nonfungible/src/erc.rsdiffbeforeafterboth140 .map_err(dispatch_to_evm::<T>)140 .map_err(dispatch_to_evm::<T>)141 }141 }142142143 /// @notice Get permissions for token properties.143 fn token_property_permissions(144 fn token_property_permissions(144 &self,145 &self,145 ) -> Result<Vec<(string, Vec<(EthTokenPermissions, bool)>)>> {146 ) -> Result<Vec<(string, Vec<(EthTokenPermissions, bool)>)>> {146 let mut res = <Vec<_>>::new();147 let mut res = <Vec<_>>::new();147 for (key, pp) in <Pallet<T>>::token_property_permission(self.id) {148 for (key, pp) in <Pallet<T>>::token_property_permission(self.id) {148 let key = string::from_utf8(key.into_inner()).unwrap();149 let key = string::from_utf8(key.into_inner()).unwrap();149 let pp = [150 let pp = vec![150 (EthTokenPermissions::Mutable, pp.mutable),151 (EthTokenPermissions::Mutable, pp.mutable),151 (EthTokenPermissions::TokenOwner, pp.token_owner),152 (EthTokenPermissions::TokenOwner, pp.token_owner),152 (EthTokenPermissions::CollectionAdmin, pp.collection_admin),153 (EthTokenPermissions::CollectionAdmin, pp.collection_admin),153 ]154 ];154 .into();155 res.push((key, pp));155 res.push((key, pp));156 }156 }157 Ok(res)157 Ok(res)pallets/refungible/src/erc.rsdiffbeforeafterboth--- a/pallets/refungible/src/erc.rs
+++ b/pallets/refungible/src/erc.rs
@@ -143,6 +143,7 @@
.map_err(dispatch_to_evm::<T>)
}
+ /// @notice Get permissions for token properties.
fn token_property_permissions(
&self,
) -> Result<Vec<(string, Vec<(EthTokenPermissions, bool)>)>> {
tests/src/eth/tokenProperties.test.tsdiffbeforeafterboth--- a/tests/src/eth/tokenProperties.test.ts
+++ b/tests/src/eth/tokenProperties.test.ts
@@ -33,6 +33,7 @@
});
itEth('Can be reconfigured', async({helper}) => {
+ const owner = await helper.eth.createAccountWithBalance(donor);
const caller = await helper.eth.createAccountWithBalance(donor);
for(const [mutable,collectionAdmin, tokenOwner] of cartesian([], [false, true], [false, true], [false, true])) {
const collection = await helper.nft.mintCollection(alice);