From 38e3df28b0be39bb66d98e6796cec8ace22ff8ec Mon Sep 17 00:00:00 2001 From: Ethen Pociask Date: Thu, 6 Jun 2024 16:07:54 -0400 Subject: [PATCH] fix: Update plasma encoding && update e2e_test --- Makefile | 2 +- eigenda/commitment.go | 2 +- test/e2e_test.go | 11 +++++++++-- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 14c96408..f03d94dc 100644 --- a/Makefile +++ b/Makefile @@ -30,7 +30,7 @@ test: go test -v ./... e2e-test: submodules srs - go test -timeout 50m -v -testnet-integration ./test/e2e_test.go + go test -timeout 50m -v ./test/e2e_test.go -testnet-integration .PHONY: lint lint: diff --git a/eigenda/commitment.go b/eigenda/commitment.go index 7cd1a804..7e451419 100644 --- a/eigenda/commitment.go +++ b/eigenda/commitment.go @@ -32,7 +32,7 @@ const ( type Commitment []byte func (c Commitment) Encode() []byte { - return append([]byte{byte(EigenDA), byte(EigenV0)}, c...) + return append([]byte{byte(op_plasma.GenericCommitmentType), byte(EigenDA), byte(EigenV0)}, c...) } // DecodeCommitment verifies and decodes an EigenDACommit from raw encoded bytes. diff --git a/test/e2e_test.go b/test/e2e_test.go index 568726bb..ab7f7677 100644 --- a/test/e2e_test.go +++ b/test/e2e_test.go @@ -9,7 +9,6 @@ import ( "testing" "time" - plasma "github.com/Layr-Labs/eigenda-proxy" proxy "github.com/Layr-Labs/eigenda-proxy" "github.com/Layr-Labs/eigenda-proxy/eigenda" "github.com/Layr-Labs/eigenda-proxy/metrics" @@ -32,6 +31,7 @@ func init() { // Use of single port makes tests incapable of running in parallel const ( + privateKey = "SIGNER_PRIVATE_KEY" transport = "http" serviceName = "eigenda_proxy" host = "127.0.0.1" @@ -42,12 +42,18 @@ const ( type TestSuite struct { ctx context.Context log log.Logger - server *plasma.DAServer + server *proxy.DAServer } func createTestSuite(t *testing.T) (TestSuite, func()) { ctx := context.Background() + // load signer key from environment + pk := os.Getenv(privateKey) + if pk == "" { + t.Fatal("SIGNER_PRIVATE_KEY environment variable not set") + } + log := oplog.NewLogger(os.Stdout, oplog.CLIConfig{ Level: log.LevelDebug, Format: oplog.FormatLogFmt, @@ -62,6 +68,7 @@ func createTestSuite(t *testing.T) (TestSuite, func()) { StatusQueryTimeout: time.Minute * 45, StatusQueryRetryInterval: time.Second * 1, DisableTLS: false, + SignerPrivateKeyHex: pk, }, }