refactor: rename concrete/wasm/bin and tinygo/std (ethereum-optimism#11)

therealbytes · Sep 2, 2023 · afadf59 · afadf59
1 parent 69dff05
commit afadf59
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 23 deletions.
diff --git a/concrete/concrete_test.go b/concrete/concrete_test.go
@@ -36,7 +36,7 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
-//go:embed wasm/bin/typical.wasm
+//go:embed wasm/testdata/typical.wasm
 var typicalWasm []byte
 
 var implementations = []struct {

diff --git a/concrete/lib/precompiles/benchmark.go b/concrete/lib/precompiles/benchmark.go
@@ -21,7 +21,7 @@ import (
 	cc_api "github.com/ethereum/go-ethereum/concrete/api"
 	"github.com/ethereum/go-ethereum/concrete/crypto"
 	"github.com/ethereum/go-ethereum/concrete/lib"
-	"github.com/ethereum/go-ethereum/tinygo/std"
+	tinygo_lib "github.com/ethereum/go-ethereum/tinygo/lib"
 )
 
 // A precompiled used for benchmarking TinyGo WASM.
@@ -32,44 +32,44 @@ type BenchmarkPrecompile struct {
 
 func (pc *BenchmarkPrecompile) Run(api cc_api.API, input []byte) ([]byte, error) {
 
-	runStart := std.Now()
+	runStart := tinygo_lib.Now()
 
 	var runs int
 	var startTime time.Time
 	var endTime time.Time
 	var timeNs int64
 
-	hash := std.Keccak256(input)
+	hash := tinygo_lib.Keccak256(input)
 
-	// std.Keccak256Hash
+	// tinygo_lib.Keccak256Hash
 
 	runs = 10000
-	startTime = std.Now()
+	startTime = tinygo_lib.Now()
 
 	for i := 0; i < runs; i++ {
-		hash = std.Keccak256(hash)
+		hash = tinygo_lib.Keccak256(hash)
 	}
 
-	endTime = std.Now()
+	endTime = tinygo_lib.Now()
 	timeNs = endTime.Sub(startTime).Nanoseconds()
-	std.Print("std.Keccak256Hash", runs, "op", timeNs, "ns", int(timeNs)/runs, "ns/op")
+	tinygo_lib.Print("tinygo_lib.Keccak256Hash", runs, "op", timeNs, "ns", int(timeNs)/runs, "ns/op")
 
 	// crypto.Keccak256Hash
 
 	runs = 10000
-	startTime = std.Now()
+	startTime = tinygo_lib.Now()
 
 	for i := 0; i < runs; i++ {
 		hash = crypto.Keccak256(hash)
 	}
 
-	endTime = std.Now()
+	endTime = tinygo_lib.Now()
 	timeNs = endTime.Sub(startTime).Nanoseconds()
-	std.Print("crypto.Keccak256Hash", runs, "op", timeNs, "ns", int(timeNs)/runs, "ns/op")
+	tinygo_lib.Print("crypto.Keccak256Hash", runs, "op", timeNs, "ns", int(timeNs)/runs, "ns/op")
 
-	runEnd := std.Now()
+	runEnd := tinygo_lib.Now()
 
-	std.Print("BenchmarkPrecompile.Run", runEnd.Sub(runStart).Microseconds(), "μs")
+	tinygo_lib.Print("BenchmarkPrecompile.Run", runEnd.Sub(runStart).Microseconds(), "μs")
 
 	return nil, nil
 }
diff --git a/concrete/lib/precompiles/typical.go b/concrete/lib/precompiles/typical.go
@@ -19,16 +19,16 @@ import (
 	cc_api "github.com/ethereum/go-ethereum/concrete/api"
 	"github.com/ethereum/go-ethereum/concrete/crypto"
 	"github.com/ethereum/go-ethereum/concrete/lib"
-	"github.com/ethereum/go-ethereum/tinygo/std"
+	tinygo_lib "github.com/ethereum/go-ethereum/tinygo/lib"
 )
 
 // A precompile used for testing.
 
-// We use std.Keccak256Hash instead of crypto.Keccak256Hash because the latter
+// We use tinygo_lib.Keccak256Hash instead of crypto.Keccak256Hash because the latter
 // may not compile in tinygo as may depend on a host function.
 var (
-	runCounterKey = std.Keccak256Hash([]byte("typical.counter.0"))
-	hashSetKey    = std.Keccak256Hash([]byte("typical.set.0"))
+	runCounterKey = tinygo_lib.Keccak256Hash([]byte("typical.counter.0"))
+	hashSetKey    = tinygo_lib.Keccak256Hash([]byte("typical.set.0"))
 )
 
 type TypicalPrecompile struct{}

diff --git a/concrete/wasm/memory_test.go b/concrete/wasm/memory_test.go
@@ -179,7 +179,7 @@ func TestPutGetReturnWithError(t *testing.T) {
 	testMemoryPutGetReturnWithError(t, memory)
 }
 
-//go:embed bin/blank.wasm
+//go:embed testdata/blank.wasm
 var blankCode []byte
 
 func newTestMemory() (bridge.Memory, bridge.Allocator) {

diff --git a/concrete/wasm/wasm_test.go b/concrete/wasm/wasm_test.go
@@ -30,10 +30,10 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
-//go:embed bin/typical.wasm
+//go:embed testdata/typical.wasm
 var typicalCode []byte
 
-//go:embed bin/benchmark.wasm
+//go:embed testdata/benchmark.wasm
 var benchmarkCode []byte
 
 var typicalImplementations = []struct {

diff --git a/tinygo/std/lib_go.go → tinygo/lib/lib_go.go b/tinygo/std/lib_go.go → tinygo/lib/lib_go.go
@@ -15,7 +15,7 @@
 
 //go:build !tinygo
 
-package std
+package lib
 
 import (
 	"fmt"

diff --git a/tinygo/std/lib_tinygo.go → tinygo/lib/lib_tinygo.go b/tinygo/std/lib_tinygo.go → tinygo/lib/lib_tinygo.go
@@ -15,7 +15,7 @@
 
 //go:build tinygo
 
-package std
+package lib
 
 import (
 	"fmt"