1
0
mirror of https://github.com/oceanprotocol/ocean.js.git synced 2024-11-26 20:39:05 +01:00

83 Commits

Author SHA1 Message Date
Miquel A. Cabot
429cce838e revert rename deployERC20 to deployDatatoken 2022-06-10 13:24:45 +02:00
Miquel A. Cabot
ad73cf855c rename deployERC20 to deployDatatoken 2022-06-10 11:02:01 +02:00
Miquel A. Cabot
29222ca85b rename from erc20 to datatoken in Datatoken test 2022-06-10 10:53:38 +02:00
Miquel A. Cabot
eedb1b4232 rename ERC20Deployer to DatatokenDeployer 2022-06-10 10:50:48 +02:00
Miquel A. Cabot
01859a52f8 rename createERC20 to createDatatoken 2022-06-10 10:45:56 +02:00
Miquel A. Cabot
87b8090ce4 rename addErc20Deployer to addDatatokenDeployer 2022-06-10 10:40:08 +02:00
Miquel A. Cabot
f374230638 rename isERC20Deployer to isDatatokenDeployer 2022-06-10 10:38:33 +02:00
Miquel A. Cabot
04629cd403 change ERC721 to NFT in datatoken test 2022-06-10 10:08:17 +02:00
Miquel A. Cabot
b371069d0f change erc721FactoryAddress to nftFactoryAddress 2022-06-10 10:06:50 +02:00
Miquel A. Cabot
eea1c374b3 Merge branch 'v4main' into issue-1346-rewrite-datatoken-test 2022-05-23 16:51:29 +02:00
Miquel A. Cabot
00e2a68918 initialize owner with null 2022-05-23 15:52:56 +02:00
Jamie Hewitt
4b9f6c9c00 Checking if the caller is Publishing Market Fee Address before calling the smart contract 2022-05-18 17:01:05 +03:00
Jamie Hewitt
9070b61111 Merge branch 'v4main' of github.com:oceanprotocol/ocean.js into issue-1335-setPublishingMarketFee-function 2022-05-18 16:06:41 +03:00
Miquel A. Cabot
d8b58af57f Merge branch 'v4main' into issue-1346-rewrite-datatoken-test 2022-05-12 17:47:05 +02:00
mihaisc
1b93d86df5
fix test
Signed-off-by: mihaisc <mihai.scarlat@smartcontrol.ro>
2022-05-03 13:32:43 +03:00
Miquel A. Cabot
c7c83e9f18 fix freParams const issue 2022-04-28 17:25:33 +02:00
Miquel A. Cabot
6f81a5ce3a Merge branch 'v4main' into issue-1346-rewrite-datatoken-test 2022-04-28 17:12:30 +02:00
Miquel A. Cabot
227ea14738 simplify constants 2022-04-28 17:12:25 +02:00
Jamie Hewitt
8c9e46a8dd Adding estimate gas method and fixing tests 2022-04-21 15:14:32 +02:00
Jamie Hewitt
4eefc083e2 Updating user addresses 2022-04-21 12:58:31 +02:00
Jamie Hewitt
a81cdddc30 Updating tests 2022-04-21 12:48:28 +02:00
Jamie Hewitt
74f4642ad0 Adding additional assert statements 2022-04-21 12:22:31 +02:00
Jamie Hewitt
d996625809 Updating assert statements 2022-04-21 11:47:47 +02:00
Jamie Hewitt
5cedb37d80 Adding additional assert to tests 2022-04-21 11:18:45 +02:00
Jamie Hewitt
257d1aeeea Adding extra test 2022-04-20 16:44:15 +02:00
Bogdan Fazakas
f96ccb0c56
Add reuseOrder method (#1421)
* added reuseOrder method

* wip add test to reuseOrder

* update test

* check also ProviderFee event
2022-04-20 16:42:07 +03:00
Jamie Hewitt
ee90d58cde Fix linting 2022-04-20 15:24:33 +02:00
Jamie Hewitt
44db9db5a4 Writting tests for setPublishingMarketFee 2022-04-20 14:42:51 +02:00
Miquel A. Cabot
3431212515 fix merge error 2022-04-19 14:51:38 +02:00
Miquel A. Cabot
258b2d6ecc
Merge branch 'v4main' into issue-1346-rewrite-datatoken-test 2022-04-19 11:09:04 +02:00
Miquel A. Cabot
8686f53f6c test datatoken.transfer() function 2022-04-18 18:37:36 +02:00
Miquel A. Cabot
3c38fa9eb2 test datatoken.getDecimals() function 2022-04-18 17:48:30 +02:00
Soon Huat
628c2fc1fc
setPaymentCollector apply same checking as contract (#1396)
* setPaymentCollector apply same checking as contract

* unit test for setPaymentCollector for owner and erc20 deployer

* setPaymentCollector amend redundent truth check on boolean value

Co-authored-by: Soon Huat <soon_huat.phan@daimler.com>
2022-04-14 15:43:01 +01:00
Miquel A. Cabot
d73790d775 uncomment assert 2022-04-13 16:13:02 +02:00
Miquel A. Cabot
8f6de3632b fix freParams initialization error 2022-04-08 08:38:06 +02:00
Miquel A. Cabot
7a6e8f42b5 convert freParams to variable 2022-04-07 20:55:19 +02:00
Miquel A. Cabot
e2df76fb90 refeactor freCreationParams constant 2022-04-07 20:46:27 +02:00
Miquel A. Cabot
f4ea396e28 Merge branch 'v4main' into issue-1346-rewrite-datatoken-test 2022-04-06 17:18:17 +02:00
Alex Coseru
005c2d9760
Feature/bump contracts to alpha 28 (#1392)
* bump contracts to alpha 28
2022-04-04 14:56:41 +03:00
Miquel A. Cabot
a6ce3002be refactor ERC20 constants 2022-03-30 12:29:35 +02:00
Miquel A. Cabot
8ec9d65cb9 refactor constants 2022-03-30 10:12:35 +02:00
Miquel A. Cabot
ba2d1e5fe7 assert that all needed exceptions are thrown 2022-03-30 10:08:06 +02:00
Miquel A. Cabot
1b426a2098 remove an unnecessary aprove statement 2022-03-29 18:15:06 +02:00
Miquel A. Cabot
feda473f26 don't import abis from contracts in tests 2022-03-29 18:10:33 +02:00
Miquel A. Cabot
4a96021cc4 refactor constants 2022-03-29 18:10:16 +02:00
Miquel A. Cabot
319bad47e7 refactor constants 2022-03-29 15:01:36 +02:00
Miquel A. Cabot
546f516cee add web3 parameter 2022-03-20 19:03:14 +01:00
Miquel A. Cabot
589ec02938 refactor TestContractHandler variable names 2022-03-20 13:55:53 +01:00
Miquel A. Cabot
a77f1c5862 convert TestContractHandler class to function 2022-03-19 15:32:02 +01:00
Miquel A. Cabot
1e12ddd630 refactor TestContractHandler.getAccounts() 2022-03-18 18:21:27 +01:00