Rewire fixes (#125)

* fix unit tests * Fix avalanchego version and remove unused files * delete yarn.lock --------- Co-authored-by: Shubham Goyal <[email protected]>
hubble-exchange · Oct 1, 2023 · 4472792 · 4472792
1 parent 9d06705
commit 4472792
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 1,556 deletions.
diff --git a/plugin/evm/vm.go b/plugin/evm/vm.go
@@ -502,6 +502,7 @@ func (vm *VM) initializeChain(lastAcceptedHash common.Hash, ethConfig ethconfig.
 	vm.blockChain = vm.eth.BlockChain()
 	vm.miner = vm.eth.Miner()
 
+	vm.limitOrderProcesser = vm.NewLimitOrderProcesser()
 	vm.eth.Start()
 	return vm.initChainState(vm.blockChain.LastAcceptedBlock())
 }
@@ -624,7 +625,6 @@ func (vm *VM) initBlockBuilding() {
 	vm.builder = vm.NewBlockBuilder(vm.toEngine)
 	vm.builder.awaitSubmittedTxs()
 	vm.Network.SetGossipHandler(NewGossipHandler(vm, gossipStats))
-
 	vm.limitOrderProcesser.ListenAndProcessTransactions(vm.builder)
 }
 

diff --git a/plugin/evm/vm_test.go b/plugin/evm/vm_test.go
@@ -17,13 +17,6 @@ import (
 	"testing"
 	"time"
 
-	"github.com/ava-labs/subnet-evm/commontype"
-	"github.com/ava-labs/subnet-evm/internal/ethapi"
-	"github.com/ava-labs/subnet-evm/metrics"
-	"github.com/ava-labs/subnet-evm/plugin/evm/message"
-	"github.com/ava-labs/subnet-evm/precompile"
-	"github.com/ava-labs/subnet-evm/trie"
-	"github.com/ava-labs/subnet-evm/vmerrs"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/common/hexutil"
 	"github.com/ethereum/go-ethereum/crypto"

diff --git a/precompile/contracts/hubblebibliophile/config.go b/precompile/contracts/hubblebibliophile/config.go
diff --git a/precompile/contracts/hubblebibliophile/contract.go b/precompile/contracts/hubblebibliophile/contract.go
diff --git a/precompile/contracts/ticks/config_test.go b/precompile/contracts/ticks/config_test.go
@@ -5,24 +5,24 @@
 package ticks
 
 import (
-	"math/big"
 	"testing"
 
 	"github.com/ava-labs/subnet-evm/precompile/precompileconfig"
 	"github.com/ava-labs/subnet-evm/precompile/testutils"
+	"github.com/ava-labs/subnet-evm/utils"
 )
 
 // TestVerify tests the verification of Config.
 func TestVerify(t *testing.T) {
 	tests := map[string]testutils.ConfigVerifyTest{
 		"valid config": {
-			Config:        NewConfig(big.NewInt(3)),
+			Config:        NewConfig(utils.NewUint64(3)),
 			ExpectedError: "",
 		},
 		// CUSTOM CODE STARTS HERE
 		// Add your own Verify tests here, e.g.:
 		// "your custom test name": {
-		// 	Config: NewConfig(big.NewInt(3),),
+		// 	Config: NewConfig(utils.NewUint64(3),),
 		// 	ExpectedError: ErrYourCustomError.Error(),
 		// },
 	}
@@ -34,23 +34,23 @@ func TestVerify(t *testing.T) {
 func TestEqual(t *testing.T) {
 	tests := map[string]testutils.ConfigEqualTest{
 		"non-nil config and nil other": {
-			Config:   NewConfig(big.NewInt(3)),
+			Config:   NewConfig(utils.NewUint64(3)),
 			Other:    nil,
 			Expected: false,
 		},
 		"different type": {
-			Config:   NewConfig(big.NewInt(3)),
+			Config:   NewConfig(utils.NewUint64(3)),
 			Other:    precompileconfig.NewNoopStatefulPrecompileConfig(),
 			Expected: false,
 		},
 		"different timestamp": {
-			Config:   NewConfig(big.NewInt(3)),
-			Other:    NewConfig(big.NewInt(4)),
+			Config:   NewConfig(utils.NewUint64(3)),
+			Other:    NewConfig(utils.NewUint64(4)),
 			Expected: false,
 		},
 		"same config": {
-			Config:   NewConfig(big.NewInt(3)),
-			Other:    NewConfig(big.NewInt(3)),
+			Config:   NewConfig(utils.NewUint64(3)),
+			Other:    NewConfig(utils.NewUint64(3)),
 			Expected: true,
 		},
 		// CUSTOM CODE STARTS HERE

diff --git a/scripts/run_local.sh b/scripts/run_local.sh
@@ -28,6 +28,6 @@ avalanche subnet configure hubblenet --subnet-config subnet.json --config .avala
 
 # use the same avalanchego version as the one used in subnet-evm
 # use tee to keep showing outut while storing in a var
-OUTPUT=$(avalanche subnet deploy hubblenet -l --avalanchego-version v1.9.14 --config .avalanche-cli.json | tee /dev/fd/2)
+OUTPUT=$(avalanche subnet deploy hubblenet -l --avalanchego-version v1.10.5 --config .avalanche-cli.json | tee /dev/fd/2)
 
 setStatus
diff --git a/scripts/upgrade_local.sh b/scripts/upgrade_local.sh
@@ -9,6 +9,6 @@ avalanche network stop --snapshot-name snap1
 avalanche subnet upgrade vm hubblenet --binary custom_evm.bin --local
 
 # utse tee to keep showing outut while storing in a var
-OUTPUT=$(avalanche network start --avalanchego-version v1.10.0 --snapshot-name snap1 --config .avalanche-cli.json | tee /dev/fd/2)
+OUTPUT=$(avalanche network start --avalanchego-version v1.10.5 --snapshot-name snap1 --config .avalanche-cli.json | tee /dev/fd/2)
 
 setStatus