diff --git a/scripts/metadata/metadata_hashes.json b/scripts/metadata/metadata_hashes.json index e6ec735..1e9b3bb 100644 --- a/scripts/metadata/metadata_hashes.json +++ b/scripts/metadata/metadata_hashes.json @@ -1 +1 @@ -["", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", ""] \ No newline at end of file +["", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", ""] \ No newline at end of file diff --git a/scripts/metadata/tokens/1.json b/scripts/metadata/tokens/1.json index 608aaca..c3f5c49 100644 --- a/scripts/metadata/tokens/1.json +++ b/scripts/metadata/tokens/1.json @@ -1 +1 @@ -{"name": "1", "attributes": [{"trait_type": "holder address", "value": "0xB9a459a00855B0b82337E692D078d7292609701C"}, {"trait_type": "debtor address", "value": "0xa5f78F093C1Fa451eAb7D3102AdF1eC6E0b85F27"}, {"trait_type": "NFT id", "value": "1"}, {"trait_type": "commission in percents", "value": "10"}, {"trait_type": "amount", "value": "1100"}, {"trait_type": "date of registration", "value": "1692017220"}, {"trait_type": "date of close", "value": "1692126000"}, {"trait_type": "date of holder consent", "value": "0"}, {"trait_type": "date of debtor consent", "value": "0"}, {"trait_type": "holder consent", "value": "False"}, {"trait_type": "debtor consent", "value": "False"}]} \ No newline at end of file +{"name": "1", "attributes": [{"trait_type": "holder address", "value": "0x6c252dB948Fb85a220c4dEFb3B582F388F1979ED"}, {"trait_type": "debtor address", "value": "0x822bbc0fF558830b57e08A68750c8248541015E0"}, {"trait_type": "NFT id", "value": "1"}, {"trait_type": "commission in percents", "value": "10"}, {"trait_type": "amount", "value": "1100"}, {"trait_type": "date of registration", "value": "1692017501"}, {"trait_type": "date of close", "value": "1692126000"}, {"trait_type": "date of holder consent", "value": "0"}, {"trait_type": "date of debtor consent", "value": "0"}, {"trait_type": "holder consent", "value": "False"}, {"trait_type": "debtor consent", "value": "False"}]} \ No newline at end of file diff --git a/scripts/nft_promissory_scripts.py b/scripts/nft_promissory_scripts.py index 6bffdd0..01fe34b 100644 --- a/scripts/nft_promissory_scripts.py +++ b/scripts/nft_promissory_scripts.py @@ -76,4 +76,10 @@ def pay_promissory(promissory, _from, token_id): 'from': _from, 'priority_fee': '10 wei' }) - return exist \ No newline at end of file + return exist + +def transfer_token(owner, to, token_id): + PromissoryNFT[-1].transferFrom(owner, to, token_id, { + 'from': owner, + 'priority_fee': '10 wei' + }) diff --git a/tests/test_nft_promissory.py b/tests/test_nft_promissory.py index 47bc7e9..d349431 100644 --- a/tests/test_nft_promissory.py +++ b/tests/test_nft_promissory.py @@ -1,8 +1,14 @@ import pytest from brownie import PromissoryNFT, Promissory, chain from conftest import * -from scripts.nft_promissory_scripts import get_promissory, create_promissory, pay_promissory, approve from scripts.promissory_scripts import set_debtor_consent, set_holder_consent +from scripts.nft_promissory_scripts import ( + get_promissory, + create_promissory, + pay_promissory, + approve, + transfer_token +) def test_nft_promissory_deploy(promissory_nft): assert promissory_nft.address != '0' @@ -35,10 +41,7 @@ def test_transfer_token(holder, debtor, third_party, promissory_nft): token_id = PromissoryNFT[-1].tokenCounter() to = third_party if network.show_active() != 'development' else accounts[2] approve(holder, PromissoryNFT[-1].address, token_id) - PromissoryNFT[-1].transferFrom(holder, to, token_id, { - 'from': holder, - 'priority_fee': '10 wei' - }) + transfer_token(holder, to, token_id) owner = PromissoryNFT[-1].ownerOf(token_id, { 'from': to, 'priority_fee': '10 wei'