Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rename service types in service migrations #3905

Merged
merged 9 commits into from
Oct 4, 2022
Merged

Rename service types in service migrations #3905

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
3f0bf70
Rename service types in service migrations
isaacsolo Sep 21, 2022
48f4a0b
rename more
isaacsolo Sep 23, 2022
7f71205
reduce changes
isaacsolo Sep 28, 2022
b2fdcac
reduce more
isaacsolo Sep 28, 2022
a7c3cbd
Merge branch 'master' into is-rename-service-type
isaacsolo Sep 28, 2022
59ecb90
add missing
isaacsolo Sep 28, 2022
79eb6a5
Merge branch 'master' into is-rename-service-type
isaacsolo Oct 3, 2022
d6e0dc3
fix
isaacsolo Oct 3, 2022
6f4e4d1
fix migrate contracts
isaacsolo Oct 4, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions eth-contracts/migrations/7_versioning_service_migration.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ const governanceKey = web3.utils.utf8ToHex('Governance')
const claimsManagerProxyKey = web3.utils.utf8ToHex('ClaimsManagerProxy')

// Known service types
const serviceTypeCN = web3.utils.utf8ToHex('creator-node')
const serviceTypeCN = web3.utils.utf8ToHex('content-node')
// Creator node
// Minimum: 200,000
// Maximum: 3,000,000
Expand All @@ -28,7 +28,7 @@ const cnTypeMax = _lib.audToWei(3000000)
// Discovery provider
// Minimum: 200,000
// Maximum: 2,000,000
const serviceTypeDP = web3.utils.utf8ToHex('discovery-provider')
const serviceTypeDP = web3.utils.utf8ToHex('discovery-node')
const dpTypeMin = _lib.audToWei(200000)
const dpTypeMax = _lib.audToWei(2000000)
// stake lockup duration = 1 wk in blocks
Expand Down
2 changes: 1 addition & 1 deletion eth-contracts/test/delegateManager.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ const governanceKey = web3.utils.utf8ToHex('Governance')
const delegateManagerKey = web3.utils.utf8ToHex('DelegateManager')
const tokenRegKey = web3.utils.utf8ToHex('Token')

const testDiscProvType = web3.utils.utf8ToHex('discovery-provider')
const testDiscProvType = web3.utils.utf8ToHex('discovery-node')
const serviceTypeMinStake = _lib.audToWei(5)
const serviceTypeMaxStake = _lib.audToWei(10000000)
const testEndpoint = 'https://localhost:5000'
Expand Down
2 changes: 1 addition & 1 deletion eth-contracts/test/delegateManagerV2.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ const governanceKey = web3.utils.utf8ToHex('Governance')
const delegateManagerKey = web3.utils.utf8ToHex('DelegateManager')
const tokenRegKey = web3.utils.utf8ToHex('Token')

const testDiscProvType = web3.utils.utf8ToHex('discovery-provider')
const testDiscProvType = web3.utils.utf8ToHex('discovery-node')
const serviceTypeMinStake = _lib.audToWei(5)
const serviceTypeMaxStake = _lib.audToWei(10000000)
const testEndpoint = 'https://localhost:5000'
Expand Down
2 changes: 1 addition & 1 deletion eth-contracts/test/governance.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ contract('Governance.sol', async (accounts) => {
const tokenOwnerAddress = proxyDeployerAddress
const guardianAddress = proxyDeployerAddress

const testDiscProvType = web3.utils.utf8ToHex('discovery-provider')
const testDiscProvType = web3.utils.utf8ToHex('discovery-node')
const testEndpoint1 = 'https://localhost:5000'
const testEndpoint2 = 'https://localhost:5001'

Expand Down
4 changes: 2 additions & 2 deletions eth-contracts/test/random/random.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ const DelegateManager = artifacts.require('DelegateManager')
const ClaimsManager = artifacts.require('ClaimsManager')
const AudiusToken = artifacts.require('AudiusToken')

const serviceTypeCN = web3.utils.utf8ToHex('creator-node')
const serviceTypeDP = web3.utils.utf8ToHex('discovery-provider')
const serviceTypeCN = web3.utils.utf8ToHex('content-node')
const serviceTypeDP = web3.utils.utf8ToHex('discovery-node')

contract('Random testing', async (accounts) => {
let token, staking, serviceTypeManager, serviceProviderFactory
Expand Down
4 changes: 2 additions & 2 deletions eth-contracts/test/serviceProvider.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ const delegateManagerKey = web3.utils.utf8ToHex('DelegateManager')
const governanceKey = web3.utils.utf8ToHex('Governance')
const tokenRegKey = web3.utils.utf8ToHex('TokenKey')

const testDiscProvType = web3.utils.utf8ToHex('discovery-provider')
const testCreatorNodeType = web3.utils.utf8ToHex('creator-node')
const testDiscProvType = web3.utils.utf8ToHex('discovery-node')
const testCreatorNodeType = web3.utils.utf8ToHex('content-node')
const testInvalidType = web3.utils.utf8ToHex('invalid-type')
const testEndpoint = 'https://localhost:5000'
const testEndpoint1 = 'https://localhost:5001'
Expand Down