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.rsdiffbeforeafterboth--- a/pallets/nonfungible/src/erc.rs
+++ b/pallets/nonfungible/src/erc.rs
@@ -140,18 +140,18 @@
.map_err(dispatch_to_evm::<T>)
}
+ /// @notice Get permissions for token properties.
fn token_property_permissions(
&self,
) -> Result<Vec<(string, Vec<(EthTokenPermissions, bool)>)>> {
let mut res = <Vec<_>>::new();
for (key, pp) in <Pallet<T>>::token_property_permission(self.id) {
let key = string::from_utf8(key.into_inner()).unwrap();
- let pp = [
+ let pp = vec![
(EthTokenPermissions::Mutable, pp.mutable),
(EthTokenPermissions::TokenOwner, pp.token_owner),
(EthTokenPermissions::CollectionAdmin, pp.collection_admin),
- ]
- .into();
+ ];
res.push((key, pp));
}
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.tsdiffbeforeafterboth33 });33 });343435 itEth('Can be reconfigured', async({helper}) => {35 itEth('Can be reconfigured', async({helper}) => {36 const owner = await helper.eth.createAccountWithBalance(donor);36 const caller = await helper.eth.createAccountWithBalance(donor);37 const caller = await helper.eth.createAccountWithBalance(donor);37 for(const [mutable,collectionAdmin, tokenOwner] of cartesian([], [false, true], [false, true], [false, true])) {38 for(const [mutable,collectionAdmin, tokenOwner] of cartesian([], [false, true], [false, true], [false, true])) {38 const collection = await helper.nft.mintCollection(alice);39 const collection = await helper.nft.mintCollection(alice);