[AVAX] Post Merge fixes for Cortina 19 (v0.12.11-rc.2)

chain4travel · Mar 28, 2024 · d0d08c8 · d0d08c8
1 parent e430f89
commit d0d08c8
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/accounts/abi/bind/bind_test.go b/accounts/abi/bind/bind_test.go
@@ -2182,7 +2182,7 @@ func golangBindings(t *testing.T, overload bool) {
 	if out, err := replacer.CombinedOutput(); err != nil {
 		t.Fatalf("failed to replace binding test dependency to current source tree: %v\n%s", err, out)
 	}
-	replacer = exec.Command(gocmd, "mod", "edit", "-x", "-require", "github.com/ava-labs/avalanchego@v0.0.0", "-replace", "github.com/ava-labs/avalanchego=github.com/chain4travel/caminogo@v1.1.18-rc0") // Repo root
+	replacer = exec.Command(gocmd, "mod", "edit", "-x", "-require", "github.com/ava-labs/avalanchego@v0.0.0", "-replace", "github.com/ava-labs/avalanchego=github.com/chain4travel/caminogo@v1.1.19-rc0") // Repo root
 	replacer.Dir = pkg
 	if out, err := replacer.CombinedOutput(); err != nil {
 		t.Fatalf("failed to replace binding test dependency to current source tree: %v\n%s", err, out)

diff --git a/plugin/evm/camino_vm_test.go b/plugin/evm/camino_vm_test.go
@@ -202,7 +202,7 @@ func DisabledTestSunrisePhase0OrphanBlock(t *testing.T) {
 	}
 
 	// Manually created Eth Block with a manually created header
-	emptyEthBlk := types.NewBlock(
+	emptyEthBlk := types.NewBlockWithExtData(
 		&types.Header{
 			Coinbase:    common.Address{1},
 			ParentHash:  blkAEthBlock.Hash(),
@@ -235,7 +235,7 @@ func DisabledTestSunrisePhase0OrphanBlock(t *testing.T) {
 	assert.ErrorIs(t, emptyBlock.Verify(context.TODO()), errEmptyBlock)
 
 	// Manually created Eth Block with a manually created header
-	orphanEthBlock := types.NewBlock(
+	orphanEthBlock := types.NewBlockWithExtData(
 		&types.Header{
 			ParentHash:  common.Hash{},
 			Difficulty:  math.BigPow(11, 11),

diff --git a/scripts/build_test.sh b/scripts/build_test.sh
@@ -18,4 +18,4 @@ CAMINOETHVM_PATH=$( cd "$( dirname "${BASH_SOURCE[0]}" )"; cd .. && pwd )
 # Load the constants
 source "$CAMINOETHVM_PATH"/scripts/constants.sh
 
-go test "$@" -timeout="30m" -coverprofile="coverage.out" -covermode="atomic" $(go list ./... | grep -v /mocks | grep -v proto | grep -v tests)
+go test "$@" -timeout="30m" -coverprofile="coverage.out" -covermode="atomic" "$(go list ./... | grep -v /mocks | grep -v proto | grep -v tests)"
diff --git a/scripts/constants.sh b/scripts/constants.sh
@@ -24,10 +24,10 @@ caminoethvm_tag=${CAMINOETHVM_TAG:-$( git describe --tags )}
 echo "Using tag: ${caminoethvm_tag}"
 
 # caminogo version
-module=$(grep caminogo $CAMINOETHVM_PATH/go.mod)
+module=$(grep caminogo "$CAMINOETHVM_PATH"/go.mod)
 # trim leading
 module="${module#"${module%%[![:space:]]*}"}"
-t=(${module//\ / })
+t=("${module//\ / }")
 caminogo_tag=${t[1]}
 
 build_image_id=${BUILD_IMAGE_ID:-"$caminogo_tag-$caminoethvm_short_commit"}