Update functions to use rust versions

Layr-Labs · Oct 16, 2024 · e1b5582 · e1b5582
1 parent 44e3726
commit e1b5582
Show file tree

Hide file tree

Showing 11 changed files with 576 additions and 1,560 deletions.
diff --git a/.gitignore b/.gitignore
@@ -15,11 +15,10 @@ go-sidecar
 /internal/tests/testdata/*.sql
 !/internal/tests/testdata/**/generateExpectedResults.sql
 !/internal/tests/testdata/**/*generateExpectedResults.sql
-!sqlite-extensions
+sqlite-extensions
 /*.tar
 /sidecar-data
 __pycache__
 test-db
 *.dylib
 *.dylib.dSYM
-/sqlite-extensions/build
diff --git a/Makefile b/Makefile
@@ -3,10 +3,9 @@
 PROJECT_ROOT = $(shell pwd)
 CGO_CFLAGS = "-I$(PROJECT_ROOT)/sqlite-extensions"
 CGO_LDFLAGS = "-L$(PROJECT_ROOT)/sqlite-extensions/build/lib -lcalculations -Wl,-rpath,$(PROJECT_ROOT)/sqlite-extensions/build/lib"
-PYTHONPATH = $(PROJECT_ROOT)/sqlite-extensions
 CGO_ENABLED = 1
 GO=$(shell which go)
-ALL_FLAGS=CGO_CFLAGS=$(CGO_CFLAGS) CGO_LDFLAGS=$(CGO_LDFLAGS) PYTHONPATH=$(PYTHONPATH) CGO_ENABLED=$(CGO_ENABLED)
+ALL_FLAGS=CGO_CFLAGS=$(CGO_CFLAGS) CGO_LDFLAGS=$(CGO_LDFLAGS) CGO_ENABLED=$(CGO_ENABLED)
 
 deps/dev:
 	${GO} install github.com/golangci/golangci-lint/cmd/[email protected]

diff --git a/cmd/debugger/main.go b/cmd/debugger/main.go
@@ -168,7 +168,7 @@ staker_weight_sum AS (
 -- Calculate staker proportion of tokens for each reward and snapshot
 staker_proportion AS (
   SELECT *,
-	calculate_staker_proportion(staker_weight, total_weight) as staker_proportion
+	staker_weight(staker_weight, total_weight) as staker_proportion
   FROM staker_weight_sum
 ),
 -- Calculate total tokens to the (staker, operator) pair

diff --git a/internal/sqlite/sqlite_test.go b/internal/sqlite/sqlite_test.go
diff --git a/internal/types/numbers/numbersData_test.go b/internal/types/numbers/numbersData_test.go
diff --git a/internal/types/numbers/numbers_test.go b/internal/types/numbers/numbers_test.go
diff --git a/internal/types/numbers/tokenCalculations.go b/internal/types/numbers/tokenCalculations.go
diff --git a/pkg/rewards/2_goldStakerRewardAmounts.go b/pkg/rewards/2_goldStakerRewardAmounts.go
@@ -114,7 +114,7 @@ staker_weight_sum AS (
 -- Calculate staker proportion of tokens for each reward and snapshot
 staker_proportion AS (
   SELECT *,
-	calculate_staker_proportion(staker_weight, total_weight) as staker_proportion
+	staker_weight(staker_weight, total_weight) as staker_proportion
   FROM staker_weight_sum
 ),
 -- Calculate total tokens to the (staker, operator) pair

diff --git a/pkg/rewards/4_goldRewardsForAll.go b/pkg/rewards/4_goldRewardsForAll.go
@@ -79,7 +79,7 @@ staker_weight_sum AS (
 -- Calculate staker token proportion
 staker_proportion AS (
   SELECT *,
-    calculate_staker_proportion(staker_weight, total_staker_weight) as staker_proportion
+    staker_weight(staker_weight, total_staker_weight) as staker_proportion
   FROM staker_weight_sum
 ),
 -- Calculate total tokens to staker

diff --git a/pkg/rewards/5_goldRfaeStakers.go b/pkg/rewards/5_goldRfaeStakers.go
@@ -107,7 +107,7 @@ staker_weight_sum AS (
 -- Calculate staker proportion of tokens for each reward and snapshot
 staker_proportion AS (
   SELECT *,
-    calculate_staker_proportion(staker_weight, total_weight) as staker_proportion
+    staker_weight(staker_weight, total_weight) as staker_proportion
   FROM staker_weight_sum
 ),
 -- Calculate total tokens to the (staker, operator) pair

diff --git a/pkg/rewards/rewards_test.go b/pkg/rewards/rewards_test.go
@@ -7,7 +7,6 @@ import (
 	"github.com/Layr-Labs/go-sidecar/internal/sqlite/migrations"
 	"github.com/Layr-Labs/go-sidecar/internal/tests"
 	"github.com/Layr-Labs/go-sidecar/internal/tests/sqlite"
-	"github.com/Layr-Labs/go-sidecar/internal/types/numbers"
 	"github.com/stretchr/testify/assert"
 	"go.uber.org/zap"
 	"gorm.io/gorm"
@@ -137,10 +136,6 @@ func Test_Rewards(t *testing.T) {
 		return
 	}
 
-	if err := numbers.InitPython(); err != nil {
-		t.Fatal(err)
-	}
-
 	dbFileName, cfg, grm, l, err := setupRewards()
 	fmt.Printf("Using db file: %+v\n", dbFileName)