fix tests

dapperlabs · Feb 19, 2025 · f6a88e6 · f6a88e6
1 parent bea276f
commit f6a88e6
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 3 deletions.
diff --git a/lib/go/contracts/contracts.go b/lib/go/contracts/contracts.go
@@ -38,7 +38,7 @@ const (
 
 // GenerateTopShotContract returns a copy
 // of the topshot contract with the import addresses updated
-func GenerateTopShotContract(ftAddr, nftAddr, metadataViewsAddr, viewResolverAddr, crossVMMetadataViewsAddr, evmAddr, topShotLockingAddr, royaltyAddr, network string) []byte {
+func GenerateTopShotContract(ftAddr, nftAddr, metadataViewsAddr, viewResolverAddr, crossVMMetadataViewsAddr, evmAddr, topShotLockingAddr, royaltyAddr, network, flowEvmContractAddr string) []byte {
 
 	topShotCode := assets.MustAssetString(topshotFile)
 
@@ -60,7 +60,7 @@ func GenerateTopShotContract(ftAddr, nftAddr, metadataViewsAddr, viewResolverAdd
 
 	codeWithNetwork := strings.ReplaceAll(codeWithTopShotRoyaltyAddr, defaultNetwork, network)
 
-	codeWithEVMContractAddress := strings.ReplaceAll(codeWithNetwork, defaultEVMContractAddress, evmAddr)
+	codeWithEVMContractAddress := strings.ReplaceAll(codeWithNetwork, defaultEVMContractAddress, flowEvmContractAddr)
 
 	return []byte(codeWithEVMContractAddress)
 }

diff --git a/lib/go/contracts/contracts_test.go b/lib/go/contracts/contracts_test.go
@@ -16,9 +16,10 @@ var addrE = "0E"
 var addrF = "0F"
 var addrG = "0G"
 var network = "mainnet"
+var flowEvmContractAddr = "0x1234565789012345657890123456578901234565"
 
 func TestTopShotContract(t *testing.T) {
-	contract := contracts.GenerateTopShotContract(addrA, addrA, addrA, addrA, addrA, addrA, addrA, addrA, network)
+	contract := contracts.GenerateTopShotContract(addrA, addrA, addrA, addrA, addrA, addrA, addrA, addrA, network, flowEvmContractAddr)
 	assert.NotNil(t, contract)
 }
 

diff --git a/lib/go/test/fast_break_test.go b/lib/go/test/fast_break_test.go
@@ -85,6 +85,7 @@ func TestFastBreak(t *testing.T) {
 		topShotLockingAddr.String(),
 		topShotRoyaltyAddr.String(),
 		Network,
+		FlowEvmContractAddr,
 	)
 	topshotAccountKey, topshotSigner := accountKeys.NewWithSigner()
 	topshotAddr, topshotAddrErr := adapter.CreateAccount(context.Background(), []*flow.AccountKey{topshotAccountKey}, []sdktemplates.Contract{

diff --git a/lib/go/test/locking_test.go b/lib/go/test/locking_test.go
@@ -463,6 +463,7 @@ func TestTopShotLocking(t *testing.T) {
 			topShotLockingAddr.String(),
 			env.FTSwitchboardAddress,
 			Network,
+			FlowEvmContractAddr,
 		)
 		fakeTopshotAccountKey, fakeTopshotSigner := accountKeys.NewWithSigner()
 		fakeTopshotAddress, _ := adapter.CreateAccount(context.Background(), []*flow.AccountKey{fakeTopshotAccountKey}, []sdktemplates.Contract{

diff --git a/lib/go/test/topshot_test.go b/lib/go/test/topshot_test.go
@@ -49,6 +49,7 @@ const (
 	MetadataViewsReplaceAddress = `"MetadataViews"`
 	ViewResolverReplaceAddress  = `"ViewResolver"`
 	Network                     = `"mainnet"`
+	FlowEvmContractAddr         = `"0x1234565789012345657890123456578901234565"`
 )
 
 // topshotTestContext will expose sugar for common actions needed to bootstrap testing
@@ -141,6 +142,7 @@ func NewTopShotTestBlockchain(t *testing.T) topshotTestBlockchain {
 		topShotLockingAddr.String(),
 		royaltyAddr.String(),
 		Network,
+		FlowEvmContractAddr,
 	)
 	topshotAccountKey, topshotSigner := accountKeys.NewWithSigner()
 	topshotAddr, err := adapter.CreateAccount(context.Background(), []*flow.AccountKey{topshotAccountKey}, []sdktemplates.Contract{
@@ -821,6 +823,7 @@ func TestTransferAdmin(t *testing.T) {
 		topShotLockingAddr.String(),
 		royaltyAddr.String(),
 		Network,
+		FlowEvmContractAddr,
 	)
 	topshotAccountKey, topshotSigner := accountKeys.NewWithSigner()
 	topshotAddr, _ := adapter.CreateAccount(context.Background(), []*flow.AccountKey{topshotAccountKey}, []sdktemplates.Contract{