Merge pull request #130 from unicornultrafoundation/test/prepare-inte…

…gration-tests

Implement some basic integration tests

cmd/u2u/launcher/app.go

@@ -0,0 +1,11 @@
+package launcher
+
+import (
+	"os"
+)
+
+func Run() error {
+	initApp()
+	initAppHelp()
+	return app.Run(os.Args)
+}

cmd/u2u/launcher/launcher.go

@@ -180,7 +180,7 @@ func initFlags() {
 }
 
 // init the CLI app.
-func init() {
+func initApp() {
 	discfilter.Enable()
 	overrideFlags()
 	overrideParams()
@@ -189,6 +189,8 @@ func init() {
 
 	// App.
 
+	app = cli.NewApp()
+	app.Name = "u2u"
 	app.Action = heliosMain
 	app.Version = params.VersionWithCommit(gitCommit, gitDate)
 	app.HideVersion = true // we have a command to print the version
@@ -248,6 +250,8 @@ func init() {
 }
 
 func Launch(args []string) error {
+	initApp()
+	initAppHelp()
 	return app.Run(args)
 }
 

cmd/u2u/launcher/run_test.go

@@ -42,6 +42,8 @@ func (tt *testcli) readConfig() {
 func init() {
 	// Run the app if we've been exec'd as "u2u-test" in exec().
 	reexec.Register("u2u-test", func() {
+		initApp()
+		initAppHelp()
 		if err := app.Run(os.Args); err != nil {
 			fmt.Fprintln(os.Stderr, err)
 			os.Exit(1)

cmd/u2u/launcher/usage.go

@@ -90,7 +90,7 @@ func calcAppHelpFlagGroups() []flags.FlagGroup {
 	}
 }
 
-func init() {
+func initAppHelp() {
 	// Override the default app help template
 	cli.AppHelpTemplate = flags.AppHelpTemplate
 

cmd/u2u/main.go

@@ -8,7 +8,7 @@ import (
 )
 
 func main() {
-	if err := launcher.Launch(os.Args); err != nil {
+	if err := launcher.Run(); err != nil {
 		fmt.Fprintln(os.Stderr, err)
 		os.Exit(1)
 	}

debug/flags.go

@@ -23,6 +23,7 @@ import (
 	_ "net/http/pprof"
 	"os"
 	"runtime"
+	"sync"
 
 	"github.com/mattn/go-colorable"
 	"github.com/mattn/go-isatty"
@@ -117,6 +118,25 @@ func init() {
 // Setup initializes profiling and logging based on the CLI flags.
 // It should be called as early as possible in the program.
 func Setup(ctx *cli.Context) error {
+	setupMutex.Lock()
+	defer setupMutex.Unlock()
+	if setupDone {
+		return nil
+	}
+	err := setup(ctx)
+	if err != nil {
+		return err
+	}
+	setupDone = true
+	return nil
+}
+
+var (
+	setupMutex sync.Mutex
+	setupDone  = false
+)
+
+func setup(ctx *cli.Context) error {
 	var ostream log.Handler
 	output := io.Writer(os.Stderr)
 	if ctx.GlobalBool(logjsonFlag.Name) {

integrationtests/account.go

@@ -0,0 +1,22 @@
+package integrationtests
+
+import (
+	"crypto/ecdsa"
+
+	"github.com/unicornultrafoundation/go-u2u/common"
+	"github.com/unicornultrafoundation/go-u2u/crypto"
+)
+
+type Account struct {
+	PrivateKey *ecdsa.PrivateKey
+}
+
+func NewAccount() *Account {
+	key, _ := crypto.GenerateKey()
+	return &Account{
+		PrivateKey: key,
+	}
+}
+func (a *Account) Address() common.Address {
+	return crypto.PubkeyToAddress(a.PrivateKey.PublicKey)
+}

integrationtests/contracts/.gitignore

@@ -0,0 +1 @@
+build

integrationtests/contracts/README.md

@@ -0,0 +1,14 @@
+# Test Contracts
+This directory contains a set of smart contracts used by integration tests.
+Contracts are grouped in applications, which may each consist of multiple 
+contracts. Each application is retained in its own directory.
+Within each application directory, the following files should be present:
+ - *.sol  ... the Solidity code for the application
+ - gen.go ... a go file with a generator rule producing Go bindings for the app
+ - *.go   ... the generated Go binding files (checked in in the code repo)
+For an example application, see the `counter` directory.
+## Code Generation Tools
+For compiling Solidity code and generating the Go bindings the following tools
+need to be installed on your system:
+- the `solc` compiler; on Ubuntu you an install it using `sudo snap install solc --edge`
+- the `abigen` tool; this can be installed using `go install github.com/unicornultrafoundation/go-u2u/cmd/abigen@latest`

integrationtests/contracts/counter/counter.sol

@@ -0,0 +1,12 @@
+
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.20;
+contract Counter {
+    int private count = 0;
+    function incrementCounter() public {
+        count += 1;
+    }
+    function getCount() public view returns (int) {
+        return count;
+    }
+}

integrationtests/contracts/counter/gen.go

@@ -0,0 +1,4 @@
+package counter
+
+//go:generate solc --bin counter.sol --abi counter.sol -o build --overwrite
+//go:generate abigen --bin=build/Counter.bin --abi=build/Counter.abi --pkg=counter --out=counter.go