Merge pull request #244 from InjectiveLabs/ofac-fix

PavelInjective · web-flow · commit 92ece76d571a · 2024-09-25T15:48:22.000+02:00
(fix/solve) Solve ofac.json path issue
diff --git a/client/chain/ofac.go b/client/chain/ofac.go
@@ -6,8 +6,7 @@ import (
 	"io"
 	"net/http"
 	"os"
-	"path/filepath"
-	"strings"
+	"path"
 )
 
 const (
@@ -40,11 +39,7 @@ func NewOfacChecker() (*OfacChecker, error) {
 }
 
 func getOfacListPath() string {
-	currentDirectory, _ := os.Getwd()
-	for !strings.HasSuffix(currentDirectory, "sdk-go") {
-		currentDirectory = filepath.Dir(currentDirectory)
-	}
-	return filepath.Join(filepath.Join(filepath.Join(currentDirectory, "client"), "metadata"), ofacListFilename)
+	return getFileAbsPath(path.Join("..", "metadata", ofacListFilename))
 }
 
 func DownloadOfacList() error {

Original file line number	Diff line number	Diff line change
`@@ -6,8 +6,7 @@ import (`
`6`	`6`	`"io"`
`7`	`7`	`"net/http"`
`8`	`8`	`"os"`
`9`		`- "path/filepath"`
`10`		`- "strings"`
	`9`	`+ "path"`
`11`	`10`	`)`
`12`	`11`
`13`	`12`	`const (`
`@@ -40,11 +39,7 @@ func NewOfacChecker() (*OfacChecker, error) {`
`40`	`39`	`}`
`41`	`40`
`42`	`41`	`func getOfacListPath() string {`
`43`		`- currentDirectory, _ := os.Getwd()`
`44`		`- for !strings.HasSuffix(currentDirectory, "sdk-go") {`
`45`		`- currentDirectory = filepath.Dir(currentDirectory)`
`46`		`- }`
`47`		`- return filepath.Join(filepath.Join(filepath.Join(currentDirectory, "client"), "metadata"), ofacListFilename)`
	`42`	`+ return getFileAbsPath(path.Join("..", "metadata", ofacListFilename))`
`48`	`43`	`}`
`49`	`44`
`50`	`45`	`func DownloadOfacList() error {`