change factory name

This commit is contained in:
owen05
2021-01-19 18:08:27 +08:00
parent 8b683af08f
commit 2c9446c94b
7 changed files with 15 additions and 14 deletions

View File

@@ -167,7 +167,7 @@ contract DPPFactory is InitializableOwnable {
// ============ View Functions ============
function getPrivatePool(address baseToken, address quoteToken)
function getDODOPool(address baseToken, address quoteToken)
external
view
returns (address[] memory pools)
@@ -175,7 +175,7 @@ contract DPPFactory is InitializableOwnable {
return _REGISTRY_[baseToken][quoteToken];
}
function getPrivatePoolBidirection(address token0, address token1)
function getDODOPoolBidirection(address token0, address token1)
external
view
returns (address[] memory baseToken0Pool, address[] memory baseToken1Pool)
@@ -183,7 +183,7 @@ contract DPPFactory is InitializableOwnable {
return (_REGISTRY_[token0][token1], _REGISTRY_[token1][token0]);
}
function getPrivatePoolByUser(address user)
function getDODOPoolByUser(address user)
external
view
returns (address[] memory pools)

View File

@@ -142,7 +142,7 @@ contract DVMFactory is InitializableOwnable {
// ============ View Functions ============
function getVendingMachine(address baseToken, address quoteToken)
function getDODOPool(address baseToken, address quoteToken)
external
view
returns (address[] memory machines)
@@ -150,7 +150,7 @@ contract DVMFactory is InitializableOwnable {
return _REGISTRY_[baseToken][quoteToken];
}
function getVendingMachineBidirection(address token0, address token1)
function getDODOPoolBidirection(address token0, address token1)
external
view
returns (address[] memory baseToken0Machines, address[] memory baseToken1Machines)
@@ -158,7 +158,7 @@ contract DVMFactory is InitializableOwnable {
return (_REGISTRY_[token0][token1], _REGISTRY_[token1][token0]);
}
function getVendingMachineByUser(address user)
function getDODOPoolByUser(address user)
external
view
returns (address[] memory machines)

View File

@@ -36,8 +36,8 @@ contract DODOV2RouteHelper {
}
function getPairDetail(address token0,address token1,address userAddr) external view returns (PairDetail[] memory res) {
(address[] memory baseToken0DVM, address[] memory baseToken1DVM) = IDODOV2(_DVM_FACTORY_).getVendingMachineBidirection(token0,token1);
(address[] memory baseToken0DPP, address[] memory baseToken1DPP) = IDODOV2(_DPP_FACTORY_).getPrivatePoolBidirection(token0,token1);
(address[] memory baseToken0DVM, address[] memory baseToken1DVM) = IDODOV2(_DVM_FACTORY_).getDODOPoolBidirection(token0,token1);
(address[] memory baseToken0DPP, address[] memory baseToken1DPP) = IDODOV2(_DPP_FACTORY_).getDODOPoolBidirection(token0,token1);
uint256 len = baseToken0DVM.length + baseToken1DVM.length + baseToken0DPP.length + baseToken1DPP.length;
res = new PairDetail[](len);
for(uint8 i = 0; i < len; i++) {

View File

@@ -34,6 +34,9 @@ interface IDODOV2 {
function getUserFeeRate(address user) external view returns (uint256 lpFeeRate, uint256 mtFeeRate);
function getDODOPoolBidirection(address token0, address token1) external view returns (address[] memory, address[] memory);
//========== DODOVendingMachine ========
function createDODOVendingMachine(
@@ -47,7 +50,6 @@ interface IDODOV2 {
function buyShares(address to) external returns (uint256,uint256,uint256);
function getVendingMachineBidirection(address token0, address token1) external view returns (address[] memory baseToken0Machines, address[] memory baseToken1Machines);
//========== DODOPrivatePool ===========
@@ -75,7 +77,6 @@ interface IDODOV2 {
uint256 minQuoteReserve
) external returns (bool);
function getPrivatePoolBidirection(address token0, address token1) external view returns (address[] memory baseToken0Pool, address[] memory baseToken1Pool);
function _OWNER_() external returns (address);