From ba68e747b53fbcac43bb1bbd49e11d2a2456e4ea Mon Sep 17 00:00:00 2001
From: Jared Wasinger <j-wasinger@hotmail.com>
Date: Tue, 3 Dec 2024 16:04:05 +0700
Subject: [PATCH] mv test contracts to internal directory under v2

---
 .../abi/bind/{testdata/v2 => v2/internal}/db/bindings.go  | 0
 .../{testdata/v2 => v2/internal}/db/combined-abi.json     | 0
 .../abi/bind/{testdata/v2 => v2/internal}/db/contract.sol | 0
 .../bind/{testdata/v2 => v2/internal}/events/bindings.go  | 0
 .../{testdata/v2 => v2/internal}/events/combined-abi.json | 0
 .../bind/{testdata/v2 => v2/internal}/events/contract.sol | 0
 .../v2 => v2/internal}/nested_libraries/abi.json          | 0
 .../v2 => v2/internal}/nested_libraries/bindings.go       | 0
 .../v2 => v2/internal}/nested_libraries/combined-abi.json | 0
 .../v2 => v2/internal}/nested_libraries/contract.sol      | 0
 .../{testdata/v2 => v2/internal}/solc_errors/bindings.go  | 0
 .../v2 => v2/internal}/solc_errors/combined-abi.json      | 0
 .../{testdata/v2 => v2/internal}/solc_errors/contract.sol | 0
 accounts/abi/bind/v2/lib_test.go                          | 8 ++++----
 14 files changed, 4 insertions(+), 4 deletions(-)
 rename accounts/abi/bind/{testdata/v2 => v2/internal}/db/bindings.go (100%)
 rename accounts/abi/bind/{testdata/v2 => v2/internal}/db/combined-abi.json (100%)
 rename accounts/abi/bind/{testdata/v2 => v2/internal}/db/contract.sol (100%)
 rename accounts/abi/bind/{testdata/v2 => v2/internal}/events/bindings.go (100%)
 rename accounts/abi/bind/{testdata/v2 => v2/internal}/events/combined-abi.json (100%)
 rename accounts/abi/bind/{testdata/v2 => v2/internal}/events/contract.sol (100%)
 rename accounts/abi/bind/{testdata/v2 => v2/internal}/nested_libraries/abi.json (100%)
 rename accounts/abi/bind/{testdata/v2 => v2/internal}/nested_libraries/bindings.go (100%)
 rename accounts/abi/bind/{testdata/v2 => v2/internal}/nested_libraries/combined-abi.json (100%)
 rename accounts/abi/bind/{testdata/v2 => v2/internal}/nested_libraries/contract.sol (100%)
 rename accounts/abi/bind/{testdata/v2 => v2/internal}/solc_errors/bindings.go (100%)
 rename accounts/abi/bind/{testdata/v2 => v2/internal}/solc_errors/combined-abi.json (100%)
 rename accounts/abi/bind/{testdata/v2 => v2/internal}/solc_errors/contract.sol (100%)

diff --git a/accounts/abi/bind/testdata/v2/db/bindings.go b/accounts/abi/bind/v2/internal/db/bindings.go
similarity index 100%
rename from accounts/abi/bind/testdata/v2/db/bindings.go
rename to accounts/abi/bind/v2/internal/db/bindings.go
diff --git a/accounts/abi/bind/testdata/v2/db/combined-abi.json b/accounts/abi/bind/v2/internal/db/combined-abi.json
similarity index 100%
rename from accounts/abi/bind/testdata/v2/db/combined-abi.json
rename to accounts/abi/bind/v2/internal/db/combined-abi.json
diff --git a/accounts/abi/bind/testdata/v2/db/contract.sol b/accounts/abi/bind/v2/internal/db/contract.sol
similarity index 100%
rename from accounts/abi/bind/testdata/v2/db/contract.sol
rename to accounts/abi/bind/v2/internal/db/contract.sol
diff --git a/accounts/abi/bind/testdata/v2/events/bindings.go b/accounts/abi/bind/v2/internal/events/bindings.go
similarity index 100%
rename from accounts/abi/bind/testdata/v2/events/bindings.go
rename to accounts/abi/bind/v2/internal/events/bindings.go
diff --git a/accounts/abi/bind/testdata/v2/events/combined-abi.json b/accounts/abi/bind/v2/internal/events/combined-abi.json
similarity index 100%
rename from accounts/abi/bind/testdata/v2/events/combined-abi.json
rename to accounts/abi/bind/v2/internal/events/combined-abi.json
diff --git a/accounts/abi/bind/testdata/v2/events/contract.sol b/accounts/abi/bind/v2/internal/events/contract.sol
similarity index 100%
rename from accounts/abi/bind/testdata/v2/events/contract.sol
rename to accounts/abi/bind/v2/internal/events/contract.sol
diff --git a/accounts/abi/bind/testdata/v2/nested_libraries/abi.json b/accounts/abi/bind/v2/internal/nested_libraries/abi.json
similarity index 100%
rename from accounts/abi/bind/testdata/v2/nested_libraries/abi.json
rename to accounts/abi/bind/v2/internal/nested_libraries/abi.json
diff --git a/accounts/abi/bind/testdata/v2/nested_libraries/bindings.go b/accounts/abi/bind/v2/internal/nested_libraries/bindings.go
similarity index 100%
rename from accounts/abi/bind/testdata/v2/nested_libraries/bindings.go
rename to accounts/abi/bind/v2/internal/nested_libraries/bindings.go
diff --git a/accounts/abi/bind/testdata/v2/nested_libraries/combined-abi.json b/accounts/abi/bind/v2/internal/nested_libraries/combined-abi.json
similarity index 100%
rename from accounts/abi/bind/testdata/v2/nested_libraries/combined-abi.json
rename to accounts/abi/bind/v2/internal/nested_libraries/combined-abi.json
diff --git a/accounts/abi/bind/testdata/v2/nested_libraries/contract.sol b/accounts/abi/bind/v2/internal/nested_libraries/contract.sol
similarity index 100%
rename from accounts/abi/bind/testdata/v2/nested_libraries/contract.sol
rename to accounts/abi/bind/v2/internal/nested_libraries/contract.sol
diff --git a/accounts/abi/bind/testdata/v2/solc_errors/bindings.go b/accounts/abi/bind/v2/internal/solc_errors/bindings.go
similarity index 100%
rename from accounts/abi/bind/testdata/v2/solc_errors/bindings.go
rename to accounts/abi/bind/v2/internal/solc_errors/bindings.go
diff --git a/accounts/abi/bind/testdata/v2/solc_errors/combined-abi.json b/accounts/abi/bind/v2/internal/solc_errors/combined-abi.json
similarity index 100%
rename from accounts/abi/bind/testdata/v2/solc_errors/combined-abi.json
rename to accounts/abi/bind/v2/internal/solc_errors/combined-abi.json
diff --git a/accounts/abi/bind/testdata/v2/solc_errors/contract.sol b/accounts/abi/bind/v2/internal/solc_errors/contract.sol
similarity index 100%
rename from accounts/abi/bind/testdata/v2/solc_errors/contract.sol
rename to accounts/abi/bind/v2/internal/solc_errors/contract.sol
diff --git a/accounts/abi/bind/v2/lib_test.go b/accounts/abi/bind/v2/lib_test.go
index 86101e3a64..90869f603f 100644
--- a/accounts/abi/bind/v2/lib_test.go
+++ b/accounts/abi/bind/v2/lib_test.go
@@ -23,8 +23,8 @@ import (
 	"github.com/ethereum/go-ethereum/accounts/abi"
 	"github.com/ethereum/go-ethereum/accounts/abi/bind"
 	"github.com/ethereum/go-ethereum/accounts/abi/bind/backends"
-	"github.com/ethereum/go-ethereum/accounts/abi/bind/testdata/v2/events"
-	"github.com/ethereum/go-ethereum/accounts/abi/bind/testdata/v2/nested_libraries"
+	"github.com/ethereum/go-ethereum/accounts/abi/bind/v2/internal/events"
+	"github.com/ethereum/go-ethereum/accounts/abi/bind/v2/internal/nested_libraries"
 	"github.com/ethereum/go-ethereum/cmd/utils"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/common/compiler"
@@ -380,7 +380,7 @@ done:
 }
 
 func TestBindingGeneration(t *testing.T) {
-	matches, _ := filepath.Glob("../testdata/v2/*")
+	matches, _ := filepath.Glob("internal/*")
 	var dirs []string
 	for _, match := range matches {
 		f, _ := os.Stat(match)
@@ -397,7 +397,7 @@ func TestBindingGeneration(t *testing.T) {
 			sigs  []map[string]string
 			libs  = make(map[string]string)
 		)
-		basePath := filepath.Join("../testdata/v2", dir)
+		basePath := filepath.Join("internal", dir)
 		combinedJsonPath := filepath.Join(basePath, "combined-abi.json")
 		abiBytes, err := os.ReadFile(combinedJsonPath)
 		if err != nil {