Merge pull request #563 from ava-labs/staking-rename

Staking rename
ava-labs · Sep 19, 2024 · 4b2e326 · 4b2e326
2 parents c1de7d3 + f01daad
commit 4b2e326
Show file tree

Hide file tree

Showing 35 changed files with 15 additions and 15 deletions.
diff --git a/...takingManager/ERC20TokenStakingManager.go → ...takingManager/ERC20TokenStakingManager.go b/...takingManager/ERC20TokenStakingManager.go → ...takingManager/ERC20TokenStakingManager.go
diff --git a/...wardCalculator/ExampleRewardCalculator.go → ...wardCalculator/ExampleRewardCalculator.go b/...wardCalculator/ExampleRewardCalculator.go → ...wardCalculator/ExampleRewardCalculator.go
diff --git a/...akingManager/NativeTokenStakingManager.go → ...akingManager/NativeTokenStakingManager.go b/...akingManager/NativeTokenStakingManager.go → ...akingManager/NativeTokenStakingManager.go
diff --git a/...oAValidatorManager/PoAValidatorManager.go → ...oAValidatorManager/PoAValidatorManager.go b/...oAValidatorManager/PoAValidatorManager.go → ...oAValidatorManager/PoAValidatorManager.go
diff --git a/contracts/mocks/ExampleERC20.sol b/contracts/mocks/ExampleERC20.sol
@@ -13,7 +13,7 @@ import {
     ERC20Burnable,
     ERC20
 } from "@openzeppelin/[email protected]/token/ERC20/extensions/ERC20Burnable.sol";
-import {IERC20Mintable} from "../staking/interfaces/IERC20Mintable.sol";
+import {IERC20Mintable} from "../validator-manager/interfaces/IERC20Mintable.sol";
 
 contract ExampleERC20 is ERC20Burnable, IERC20Mintable {
     string private constant _TOKEN_NAME = "Mock Token";

diff --git a/...acts/staking/ERC20TokenStakingManager.sol → ...ator-manager/ERC20TokenStakingManager.sol b/...acts/staking/ERC20TokenStakingManager.sol → ...ator-manager/ERC20TokenStakingManager.sol
diff --git a/...racts/staking/ExampleRewardCalculator.sol → ...dator-manager/ExampleRewardCalculator.sol b/...racts/staking/ExampleRewardCalculator.sol → ...dator-manager/ExampleRewardCalculator.sol
diff --git a/...cts/staking/NativeTokenStakingManager.sol → ...tor-manager/NativeTokenStakingManager.sol b/...cts/staking/NativeTokenStakingManager.sol → ...tor-manager/NativeTokenStakingManager.sol
diff --git a/contracts/staking/PoAValidatorManager.sol → ...validator-manager/PoAValidatorManager.sol b/contracts/staking/PoAValidatorManager.sol → ...validator-manager/PoAValidatorManager.sol
diff --git a/contracts/staking/PoSValidatorManager.sol → ...validator-manager/PoSValidatorManager.sol b/contracts/staking/PoSValidatorManager.sol → ...validator-manager/PoSValidatorManager.sol
diff --git a/contracts/staking/README.md → contracts/validator-manager/README.md b/contracts/staking/README.md → contracts/validator-manager/README.md
diff --git a/contracts/staking/ValidatorManager.sol → ...ts/validator-manager/ValidatorManager.sol b/contracts/staking/ValidatorManager.sol → ...ts/validator-manager/ValidatorManager.sol
diff --git a/contracts/staking/ValidatorMessages.sol → ...s/validator-manager/ValidatorMessages.sol b/contracts/staking/ValidatorMessages.sol → ...s/validator-manager/ValidatorMessages.sol
diff --git a/...cts/staking/interfaces/IERC20Mintable.sol → ...tor-manager/interfaces/IERC20Mintable.sol b/...cts/staking/interfaces/IERC20Mintable.sol → ...tor-manager/interfaces/IERC20Mintable.sol
diff --git a/.../interfaces/IERC20TokenStakingManager.sol → .../interfaces/IERC20TokenStakingManager.sol b/.../interfaces/IERC20TokenStakingManager.sol → .../interfaces/IERC20TokenStakingManager.sol
diff --git a/...interfaces/INativeTokenStakingManager.sol → ...interfaces/INativeTokenStakingManager.sol b/...interfaces/INativeTokenStakingManager.sol → ...interfaces/INativeTokenStakingManager.sol
diff --git a/...aking/interfaces/IPoAValidatorManager.sol → ...nager/interfaces/IPoAValidatorManager.sol b/...aking/interfaces/IPoAValidatorManager.sol → ...nager/interfaces/IPoAValidatorManager.sol
diff --git a/...aking/interfaces/IPoSValidatorManager.sol → ...nager/interfaces/IPoSValidatorManager.sol b/...aking/interfaces/IPoSValidatorManager.sol → ...nager/interfaces/IPoSValidatorManager.sol
diff --git a/.../staking/interfaces/IRewardCalculator.sol → ...-manager/interfaces/IRewardCalculator.sol b/.../staking/interfaces/IRewardCalculator.sol → ...-manager/interfaces/IRewardCalculator.sol
diff --git a/.../staking/interfaces/IValidatorManager.sol → ...-manager/interfaces/IValidatorManager.sol b/.../staking/interfaces/IValidatorManager.sol → ...-manager/interfaces/IValidatorManager.sol
diff --git a/...tests/ERC20TokenStakingManagerTests.t.sol → ...tests/ERC20TokenStakingManagerTests.t.sol b/...tests/ERC20TokenStakingManagerTests.t.sol → ...tests/ERC20TokenStakingManagerTests.t.sol
diff --git a/...tests/ExamplesRewardCalculatorTests.t.sol → ...tests/ExamplesRewardCalculatorTests.t.sol b/...tests/ExamplesRewardCalculatorTests.t.sol → ...tests/ExamplesRewardCalculatorTests.t.sol
diff --git a/...ests/NativeTokenStakingManagerTests.t.sol → ...ests/NativeTokenStakingManagerTests.t.sol b/...ests/NativeTokenStakingManagerTests.t.sol → ...ests/NativeTokenStakingManagerTests.t.sol
diff --git a/...king/tests/PoAValidatorManagerTests.t.sol → ...ager/tests/PoAValidatorManagerTests.t.sol b/...king/tests/PoAValidatorManagerTests.t.sol → ...ager/tests/PoAValidatorManagerTests.t.sol
diff --git a/...king/tests/PoSValidatorManagerTests.t.sol → ...ager/tests/PoSValidatorManagerTests.t.sol b/...king/tests/PoSValidatorManagerTests.t.sol → ...ager/tests/PoSValidatorManagerTests.t.sol
diff --git a/...staking/tests/ValidatorManagerTests.t.sol → ...manager/tests/ValidatorManagerTests.t.sol b/...staking/tests/ValidatorManagerTests.t.sol → ...manager/tests/ValidatorManagerTests.t.sol
diff --git a/...taking/tests/ValidatorMessagesTests.t.sol → ...anager/tests/ValidatorMessagesTests.t.sol b/...taking/tests/ValidatorMessagesTests.t.sol → ...anager/tests/ValidatorMessagesTests.t.sol
diff --git a/tests/flows/staking/erc20_delegation.go → ...ows/validator-manager/erc20_delegation.go b/tests/flows/staking/erc20_delegation.go → ...ows/validator-manager/erc20_delegation.go
diff --git a/tests/flows/staking/erc20_token_staking.go → .../validator-manager/erc20_token_staking.go b/tests/flows/staking/erc20_token_staking.go → .../validator-manager/erc20_token_staking.go
diff --git a/tests/flows/staking/native_delegation.go → ...ws/validator-manager/native_delegation.go b/tests/flows/staking/native_delegation.go → ...ws/validator-manager/native_delegation.go
diff --git a/tests/flows/staking/native_token_staking.go → ...validator-manager/native_token_staking.go b/tests/flows/staking/native_token_staking.go → ...validator-manager/native_token_staking.go
diff --git a/tests/flows/staking/poa_to_pos.go → tests/flows/validator-manager/poa_to_pos.go b/tests/flows/staking/poa_to_pos.go → tests/flows/validator-manager/poa_to_pos.go
@@ -6,8 +6,8 @@ import (
 
 	"github.com/ava-labs/avalanchego/ids"
 	"github.com/ava-labs/subnet-evm/accounts/abi/bind"
-	nativetokenstakingmanager "github.com/ava-labs/teleporter/abi-bindings/go/staking/NativeTokenStakingManager"
-	poavalidatormanager "github.com/ava-labs/teleporter/abi-bindings/go/staking/PoAValidatorManager"
+	nativetokenstakingmanager "github.com/ava-labs/teleporter/abi-bindings/go/validator-manager/NativeTokenStakingManager"
+	poavalidatormanager "github.com/ava-labs/teleporter/abi-bindings/go/validator-manager/PoAValidatorManager"
 	"github.com/ava-labs/teleporter/tests/interfaces"
 	"github.com/ava-labs/teleporter/tests/utils"
 	"github.com/ethereum/go-ethereum/crypto"

diff --git a/tests/flows/staking/poa_validator_manager.go → ...alidator-manager/poa_validator_manager.go b/tests/flows/staking/poa_validator_manager.go → ...alidator-manager/poa_validator_manager.go
@@ -8,7 +8,7 @@ import (
 	"github.com/ava-labs/avalanchego/ids"
 	"github.com/ava-labs/avalanchego/utils/crypto/bls"
 	"github.com/ava-labs/subnet-evm/accounts/abi/bind"
-	poavalidatormanager "github.com/ava-labs/teleporter/abi-bindings/go/staking/PoAValidatorManager"
+	poavalidatormanager "github.com/ava-labs/teleporter/abi-bindings/go/validator-manager/PoAValidatorManager"
 	"github.com/ava-labs/teleporter/tests/interfaces"
 	"github.com/ava-labs/teleporter/tests/utils"
 	"github.com/ethereum/go-ethereum/crypto"

diff --git a/tests/local/e2e_test.go b/tests/local/e2e_test.go
@@ -8,9 +8,9 @@ import (
 	"testing"
 
 	"github.com/ava-labs/teleporter/tests/flows/governance"
-	"github.com/ava-labs/teleporter/tests/flows/staking"
 	"github.com/ava-labs/teleporter/tests/flows/teleporter"
 	"github.com/ava-labs/teleporter/tests/flows/teleporter/registry"
+	validatorManager "github.com/ava-labs/teleporter/tests/flows/validator-manager"
 	deploymentUtils "github.com/ava-labs/teleporter/utils/deployment-utils"
 	"github.com/ethereum/go-ethereum/log"
 	"github.com/onsi/ginkgo/v2"
@@ -200,31 +200,31 @@ var _ = ginkgo.Describe("[Teleporter integration tests]", func() {
 	ginkgo.It("Native token staking manager",
 		ginkgo.Label(validatorManagerLabel),
 		func() {
-			staking.NativeTokenStakingManager(LocalNetworkInstance)
+			validatorManager.NativeTokenStakingManager(LocalNetworkInstance)
 		})
 	ginkgo.It("ERC20 token staking manager",
 		ginkgo.Label(validatorManagerLabel),
 		func() {
-			staking.ERC20TokenStakingManager(LocalNetworkInstance)
+			validatorManager.ERC20TokenStakingManager(LocalNetworkInstance)
 		})
 	ginkgo.It("PoA validator manager",
 		ginkgo.Label(validatorManagerLabel),
 		func() {
-			staking.PoAValidatorManager(LocalNetworkInstance)
+			validatorManager.PoAValidatorManager(LocalNetworkInstance)
 		})
 	ginkgo.It("ERC20 delegation",
 		ginkgo.Label(validatorManagerLabel),
 		func() {
-			staking.ERC20Delegation(LocalNetworkInstance)
+			validatorManager.ERC20Delegation(LocalNetworkInstance)
 		})
 	ginkgo.It("Native token delegation",
 		ginkgo.Label(validatorManagerLabel),
 		func() {
-			staking.NativeDelegation(LocalNetworkInstance)
+			validatorManager.NativeDelegation(LocalNetworkInstance)
 		})
 	ginkgo.It("PoA migration to PoS",
 		ginkgo.Label(validatorManagerLabel),
 		func() {
-			staking.PoAMigrationToPoS(LocalNetworkInstance)
+			validatorManager.PoAMigrationToPoS(LocalNetworkInstance)
 		})
 })
diff --git a/tests/utils/staking.go → tests/utils/validator_manager.go b/tests/utils/staking.go → tests/utils/validator_manager.go
@@ -21,10 +21,10 @@ import (
 	"github.com/ava-labs/subnet-evm/precompile/contracts/warp"
 	predicateutils "github.com/ava-labs/subnet-evm/predicate"
 	exampleerc20 "github.com/ava-labs/teleporter/abi-bindings/go/mocks/ExampleERC20"
-	erc20tokenstakingmanager "github.com/ava-labs/teleporter/abi-bindings/go/staking/ERC20TokenStakingManager"
-	examplerewardcalculator "github.com/ava-labs/teleporter/abi-bindings/go/staking/ExampleRewardCalculator"
-	nativetokenstakingmanager "github.com/ava-labs/teleporter/abi-bindings/go/staking/NativeTokenStakingManager"
-	poavalidatormanager "github.com/ava-labs/teleporter/abi-bindings/go/staking/PoAValidatorManager"
+	erc20tokenstakingmanager "github.com/ava-labs/teleporter/abi-bindings/go/validator-manager/ERC20TokenStakingManager"
+	examplerewardcalculator "github.com/ava-labs/teleporter/abi-bindings/go/validator-manager/ExampleRewardCalculator"
+	nativetokenstakingmanager "github.com/ava-labs/teleporter/abi-bindings/go/validator-manager/NativeTokenStakingManager"
+	poavalidatormanager "github.com/ava-labs/teleporter/abi-bindings/go/validator-manager/PoAValidatorManager"
 	"github.com/ava-labs/teleporter/tests/interfaces"
 	"github.com/ethereum/go-ethereum/common"