update tests

accounts/abi/abigen/testdata/v2/callbackparam.go.txt

@@ -45,7 +45,7 @@ func NewCallbackParam() *CallbackParam {
 
 // Instance creates a wrapper for a deployed contract instance at the given address.
 // Use this to create the instance object passed to abigen v2 library functions Call, Transact, etc.
-func (c *CallbackParam) Instance(backend bind.ContractBackend, addr common.Address) *bind.BoundContract {
+func (c *CallbackParam) Instance(backend bind.ContractBackend, addr common.Address) bind.BoundContract {
 	return bind.NewContractInstance(backend, addr, c.abi)
 }
 

accounts/abi/abigen/testdata/v2/crowdsale.go.txt

@@ -45,7 +45,7 @@ func NewCrowdsale() *Crowdsale {
 
 // Instance creates a wrapper for a deployed contract instance at the given address.
 // Use this to create the instance object passed to abigen v2 library functions Call, Transact, etc.
-func (c *Crowdsale) Instance(backend bind.ContractBackend, addr common.Address) *bind.BoundContract {
+func (c *Crowdsale) Instance(backend bind.ContractBackend, addr common.Address) bind.BoundContract {
 	return bind.NewContractInstance(backend, addr, c.abi)
 }
 

accounts/abi/abigen/testdata/v2/dao.go.txt

@@ -45,7 +45,7 @@ func NewDAO() *DAO {
 
 // Instance creates a wrapper for a deployed contract instance at the given address.
 // Use this to create the instance object passed to abigen v2 library functions Call, Transact, etc.
-func (c *DAO) Instance(backend bind.ContractBackend, addr common.Address) *bind.BoundContract {
+func (c *DAO) Instance(backend bind.ContractBackend, addr common.Address) bind.BoundContract {
 	return bind.NewContractInstance(backend, addr, c.abi)
 }
 

accounts/abi/abigen/testdata/v2/deeplynestedarray.go.txt

@@ -45,7 +45,7 @@ func NewDeeplyNestedArray() *DeeplyNestedArray {
 
 // Instance creates a wrapper for a deployed contract instance at the given address.
 // Use this to create the instance object passed to abigen v2 library functions Call, Transact, etc.
-func (c *DeeplyNestedArray) Instance(backend bind.ContractBackend, addr common.Address) *bind.BoundContract {
+func (c *DeeplyNestedArray) Instance(backend bind.ContractBackend, addr common.Address) bind.BoundContract {
 	return bind.NewContractInstance(backend, addr, c.abi)
 }
 

accounts/abi/abigen/testdata/v2/empty.go.txt

@@ -45,6 +45,6 @@ func NewEmpty() *Empty {
 
 // Instance creates a wrapper for a deployed contract instance at the given address.
 // Use this to create the instance object passed to abigen v2 library functions Call, Transact, etc.
-func (c *Empty) Instance(backend bind.ContractBackend, addr common.Address) *bind.BoundContract {
+func (c *Empty) Instance(backend bind.ContractBackend, addr common.Address) bind.BoundContract {
 	return bind.NewContractInstance(backend, addr, c.abi)
 }

accounts/abi/abigen/testdata/v2/eventchecker.go.txt

@@ -44,7 +44,7 @@ func NewEventChecker() *EventChecker {
 
 // Instance creates a wrapper for a deployed contract instance at the given address.
 // Use this to create the instance object passed to abigen v2 library functions Call, Transact, etc.
-func (c *EventChecker) Instance(backend bind.ContractBackend, addr common.Address) *bind.BoundContract {
+func (c *EventChecker) Instance(backend bind.ContractBackend, addr common.Address) bind.BoundContract {
 	return bind.NewContractInstance(backend, addr, c.abi)
 }
 

accounts/abi/abigen/testdata/v2/getter.go.txt

@@ -45,7 +45,7 @@ func NewGetter() *Getter {
 
 // Instance creates a wrapper for a deployed contract instance at the given address.
 // Use this to create the instance object passed to abigen v2 library functions Call, Transact, etc.
-func (c *Getter) Instance(backend bind.ContractBackend, addr common.Address) *bind.BoundContract {
+func (c *Getter) Instance(backend bind.ContractBackend, addr common.Address) bind.BoundContract {
 	return bind.NewContractInstance(backend, addr, c.abi)
 }
 

accounts/abi/abigen/testdata/v2/identifiercollision.go.txt

@@ -45,7 +45,7 @@ func NewIdentifierCollision() *IdentifierCollision {
 
 // Instance creates a wrapper for a deployed contract instance at the given address.
 // Use this to create the instance object passed to abigen v2 library functions Call, Transact, etc.
-func (c *IdentifierCollision) Instance(backend bind.ContractBackend, addr common.Address) *bind.BoundContract {
+func (c *IdentifierCollision) Instance(backend bind.ContractBackend, addr common.Address) bind.BoundContract {
 	return bind.NewContractInstance(backend, addr, c.abi)
 }
 

accounts/abi/abigen/testdata/v2/inputchecker.go.txt

@@ -44,7 +44,7 @@ func NewInputChecker() *InputChecker {
 
 // Instance creates a wrapper for a deployed contract instance at the given address.
 // Use this to create the instance object passed to abigen v2 library functions Call, Transact, etc.
-func (c *InputChecker) Instance(backend bind.ContractBackend, addr common.Address) *bind.BoundContract {
+func (c *InputChecker) Instance(backend bind.ContractBackend, addr common.Address) bind.BoundContract {
 	return bind.NewContractInstance(backend, addr, c.abi)
 }
 

accounts/abi/abigen/testdata/v2/interactor.go.txt

@@ -45,7 +45,7 @@ func NewInteractor() *Interactor {
 
 // Instance creates a wrapper for a deployed contract instance at the given address.
 // Use this to create the instance object passed to abigen v2 library functions Call, Transact, etc.
-func (c *Interactor) Instance(backend bind.ContractBackend, addr common.Address) *bind.BoundContract {
+func (c *Interactor) Instance(backend bind.ContractBackend, addr common.Address) bind.BoundContract {
 	return bind.NewContractInstance(backend, addr, c.abi)
 }
 

accounts/abi/abigen/testdata/v2/nameconflict.go.txt

@@ -51,7 +51,7 @@ func NewNameConflict() *NameConflict {
 
 // Instance creates a wrapper for a deployed contract instance at the given address.
 // Use this to create the instance object passed to abigen v2 library functions Call, Transact, etc.
-func (c *NameConflict) Instance(backend bind.ContractBackend, addr common.Address) *bind.BoundContract {
+func (c *NameConflict) Instance(backend bind.ContractBackend, addr common.Address) bind.BoundContract {
 	return bind.NewContractInstance(backend, addr, c.abi)
 }
 

accounts/abi/abigen/testdata/v2/numericmethodname.go.txt

@@ -45,7 +45,7 @@ func NewNumericMethodName() *NumericMethodName {
 
 // Instance creates a wrapper for a deployed contract instance at the given address.
 // Use this to create the instance object passed to abigen v2 library functions Call, Transact, etc.
-func (c *NumericMethodName) Instance(backend bind.ContractBackend, addr common.Address) *bind.BoundContract {
+func (c *NumericMethodName) Instance(backend bind.ContractBackend, addr common.Address) bind.BoundContract {
 	return bind.NewContractInstance(backend, addr, c.abi)
 }
 

accounts/abi/abigen/testdata/v2/outputchecker.go.txt

@@ -44,7 +44,7 @@ func NewOutputChecker() *OutputChecker {
 
 // Instance creates a wrapper for a deployed contract instance at the given address.
 // Use this to create the instance object passed to abigen v2 library functions Call, Transact, etc.
-func (c *OutputChecker) Instance(backend bind.ContractBackend, addr common.Address) *bind.BoundContract {
+func (c *OutputChecker) Instance(backend bind.ContractBackend, addr common.Address) bind.BoundContract {
 	return bind.NewContractInstance(backend, addr, c.abi)
 }
 

accounts/abi/abigen/testdata/v2/overload.go.txt

@@ -45,7 +45,7 @@ func NewOverload() *Overload {
 
 // Instance creates a wrapper for a deployed contract instance at the given address.
 // Use this to create the instance object passed to abigen v2 library functions Call, Transact, etc.
-func (c *Overload) Instance(backend bind.ContractBackend, addr common.Address) *bind.BoundContract {
+func (c *Overload) Instance(backend bind.ContractBackend, addr common.Address) bind.BoundContract {
 	return bind.NewContractInstance(backend, addr, c.abi)
 }
 

accounts/abi/abigen/testdata/v2/rangekeyword.go.txt

@@ -45,7 +45,7 @@ func NewRangeKeyword() *RangeKeyword {
 
 // Instance creates a wrapper for a deployed contract instance at the given address.
 // Use this to create the instance object passed to abigen v2 library functions Call, Transact, etc.
-func (c *RangeKeyword) Instance(backend bind.ContractBackend, addr common.Address) *bind.BoundContract {
+func (c *RangeKeyword) Instance(backend bind.ContractBackend, addr common.Address) bind.BoundContract {
 	return bind.NewContractInstance(backend, addr, c.abi)
 }
 

accounts/abi/abigen/testdata/v2/slicer.go.txt

@@ -45,7 +45,7 @@ func NewSlicer() *Slicer {
 
 // Instance creates a wrapper for a deployed contract instance at the given address.
 // Use this to create the instance object passed to abigen v2 library functions Call, Transact, etc.
-func (c *Slicer) Instance(backend bind.ContractBackend, addr common.Address) *bind.BoundContract {
+func (c *Slicer) Instance(backend bind.ContractBackend, addr common.Address) bind.BoundContract {
 	return bind.NewContractInstance(backend, addr, c.abi)
 }
 

accounts/abi/abigen/testdata/v2/structs-abi.go.txt

@@ -49,7 +49,7 @@ func NewStructs() *Structs {
 
 // Instance creates a wrapper for a deployed contract instance at the given address.
 // Use this to create the instance object passed to abigen v2 library functions Call, Transact, etc.
-func (c *Structs) Instance(backend bind.ContractBackend, addr common.Address) *bind.BoundContract {
+func (c *Structs) Instance(backend bind.ContractBackend, addr common.Address) bind.BoundContract {
 	return bind.NewContractInstance(backend, addr, c.abi)
 }
 

accounts/abi/abigen/testdata/v2/structs.go.txt

@@ -50,7 +50,7 @@ func NewStructs() *Structs {
 
 // Instance creates a wrapper for a deployed contract instance at the given address.
 // Use this to create the instance object passed to abigen v2 library functions Call, Transact, etc.
-func (c *Structs) Instance(backend bind.ContractBackend, addr common.Address) *bind.BoundContract {
+func (c *Structs) Instance(backend bind.ContractBackend, addr common.Address) bind.BoundContract {
 	return bind.NewContractInstance(backend, addr, c.abi)
 }
 

accounts/abi/abigen/testdata/v2/token.go.txt

@@ -45,7 +45,7 @@ func NewToken() *Token {
 
 // Instance creates a wrapper for a deployed contract instance at the given address.
 // Use this to create the instance object passed to abigen v2 library functions Call, Transact, etc.
-func (c *Token) Instance(backend bind.ContractBackend, addr common.Address) *bind.BoundContract {
+func (c *Token) Instance(backend bind.ContractBackend, addr common.Address) bind.BoundContract {
 	return bind.NewContractInstance(backend, addr, c.abi)
 }
 

accounts/abi/abigen/testdata/v2/tuple.go.txt

@@ -70,7 +70,7 @@ func NewTuple() *Tuple {
 
 // Instance creates a wrapper for a deployed contract instance at the given address.
 // Use this to create the instance object passed to abigen v2 library functions Call, Transact, etc.
-func (c *Tuple) Instance(backend bind.ContractBackend, addr common.Address) *bind.BoundContract {
+func (c *Tuple) Instance(backend bind.ContractBackend, addr common.Address) bind.BoundContract {
 	return bind.NewContractInstance(backend, addr, c.abi)
 }
 

accounts/abi/abigen/testdata/v2/tupler.go.txt

@@ -45,7 +45,7 @@ func NewTupler() *Tupler {
 
 // Instance creates a wrapper for a deployed contract instance at the given address.
 // Use this to create the instance object passed to abigen v2 library functions Call, Transact, etc.
-func (c *Tupler) Instance(backend bind.ContractBackend, addr common.Address) *bind.BoundContract {
+func (c *Tupler) Instance(backend bind.ContractBackend, addr common.Address) bind.BoundContract {
 	return bind.NewContractInstance(backend, addr, c.abi)
 }
 

accounts/abi/abigen/testdata/v2/underscorer.go.txt

@@ -45,7 +45,7 @@ func NewUnderscorer() *Underscorer {
 
 // Instance creates a wrapper for a deployed contract instance at the given address.
 // Use this to create the instance object passed to abigen v2 library functions Call, Transact, etc.
-func (c *Underscorer) Instance(backend bind.ContractBackend, addr common.Address) *bind.BoundContract {
+func (c *Underscorer) Instance(backend bind.ContractBackend, addr common.Address) bind.BoundContract {
 	return bind.NewContractInstance(backend, addr, c.abi)
 }
 

accounts/abi/bind/v2/internal/contracts/db/bindings.go

@@ -52,7 +52,7 @@ func NewDB() *DB {
 
 // Instance creates a wrapper for a deployed contract instance at the given address.
 // Use this to create the instance object passed to abigen v2 library functions Call, Transact, etc.
-func (c *DB) Instance(backend bind.ContractBackend, addr common.Address) *bind.BoundContract {
+func (c *DB) Instance(backend bind.ContractBackend, addr common.Address) bind.BoundContract {
 	return bind.NewContractInstance(backend, addr, c.abi)
 }
 

accounts/abi/bind/v2/internal/contracts/events/bindings.go

@@ -51,7 +51,7 @@ func NewC() *C {
 
 // Instance creates a wrapper for a deployed contract instance at the given address.
 // Use this to create the instance object passed to abigen v2 library functions Call, Transact, etc.
-func (c *C) Instance(backend bind.ContractBackend, addr common.Address) *bind.BoundContract {
+func (c *C) Instance(backend bind.ContractBackend, addr common.Address) bind.BoundContract {
 	return bind.NewContractInstance(backend, addr, c.abi)
 }
 

accounts/abi/bind/v2/internal/contracts/nested_libraries/bindings.go

@@ -49,7 +49,7 @@ func NewC1() *C1 {
 
 // Instance creates a wrapper for a deployed contract instance at the given address.
 // Use this to create the instance object passed to abigen v2 library functions Call, Transact, etc.
-func (c *C1) Instance(backend bind.ContractBackend, addr common.Address) *bind.BoundContract {
+func (c *C1) Instance(backend bind.ContractBackend, addr common.Address) bind.BoundContract {
 	return bind.NewContractInstance(backend, addr, c.abi)
 }
 
@@ -112,7 +112,7 @@ func NewC2() *C2 {
 
 // Instance creates a wrapper for a deployed contract instance at the given address.
 // Use this to create the instance object passed to abigen v2 library functions Call, Transact, etc.
-func (c *C2) Instance(backend bind.ContractBackend, addr common.Address) *bind.BoundContract {
+func (c *C2) Instance(backend bind.ContractBackend, addr common.Address) bind.BoundContract {
 	return bind.NewContractInstance(backend, addr, c.abi)
 }
 
@@ -171,7 +171,7 @@ func NewL1() *L1 {
 
 // Instance creates a wrapper for a deployed contract instance at the given address.
 // Use this to create the instance object passed to abigen v2 library functions Call, Transact, etc.
-func (c *L1) Instance(backend bind.ContractBackend, addr common.Address) *bind.BoundContract {
+func (c *L1) Instance(backend bind.ContractBackend, addr common.Address) bind.BoundContract {
 	return bind.NewContractInstance(backend, addr, c.abi)
 }
 
@@ -225,7 +225,7 @@ func NewL2() *L2 {
 
 // Instance creates a wrapper for a deployed contract instance at the given address.
 // Use this to create the instance object passed to abigen v2 library functions Call, Transact, etc.
-func (c *L2) Instance(backend bind.ContractBackend, addr common.Address) *bind.BoundContract {
+func (c *L2) Instance(backend bind.ContractBackend, addr common.Address) bind.BoundContract {
 	return bind.NewContractInstance(backend, addr, c.abi)
 }
 
@@ -279,7 +279,7 @@ func NewL2b() *L2b {
 
 // Instance creates a wrapper for a deployed contract instance at the given address.
 // Use this to create the instance object passed to abigen v2 library functions Call, Transact, etc.
-func (c *L2b) Instance(backend bind.ContractBackend, addr common.Address) *bind.BoundContract {
+func (c *L2b) Instance(backend bind.ContractBackend, addr common.Address) bind.BoundContract {
 	return bind.NewContractInstance(backend, addr, c.abi)
 }
 
@@ -330,7 +330,7 @@ func NewL3() *L3 {
 
 // Instance creates a wrapper for a deployed contract instance at the given address.
 // Use this to create the instance object passed to abigen v2 library functions Call, Transact, etc.
-func (c *L3) Instance(backend bind.ContractBackend, addr common.Address) *bind.BoundContract {
+func (c *L3) Instance(backend bind.ContractBackend, addr common.Address) bind.BoundContract {
 	return bind.NewContractInstance(backend, addr, c.abi)
 }
 
@@ -385,7 +385,7 @@ func NewL4() *L4 {
 
 // Instance creates a wrapper for a deployed contract instance at the given address.
 // Use this to create the instance object passed to abigen v2 library functions Call, Transact, etc.
-func (c *L4) Instance(backend bind.ContractBackend, addr common.Address) *bind.BoundContract {
+func (c *L4) Instance(backend bind.ContractBackend, addr common.Address) bind.BoundContract {
 	return bind.NewContractInstance(backend, addr, c.abi)
 }
 
@@ -439,7 +439,7 @@ func NewL4b() *L4b {
 
 // Instance creates a wrapper for a deployed contract instance at the given address.
 // Use this to create the instance object passed to abigen v2 library functions Call, Transact, etc.
-func (c *L4b) Instance(backend bind.ContractBackend, addr common.Address) *bind.BoundContract {
+func (c *L4b) Instance(backend bind.ContractBackend, addr common.Address) bind.BoundContract {
 	return bind.NewContractInstance(backend, addr, c.abi)
 }
 

accounts/abi/bind/v2/internal/contracts/solc_errors/bindings.go

@@ -45,7 +45,7 @@ func NewC() *C {
 
 // Instance creates a wrapper for a deployed contract instance at the given address.
 // Use this to create the instance object passed to abigen v2 library functions Call, Transact, etc.
-func (c *C) Instance(backend bind.ContractBackend, addr common.Address) *bind.BoundContract {
+func (c *C) Instance(backend bind.ContractBackend, addr common.Address) bind.BoundContract {
 	return bind.NewContractInstance(backend, addr, c.abi)
 }
 
@@ -151,7 +151,7 @@ func NewC2() *C2 {
 
 // Instance creates a wrapper for a deployed contract instance at the given address.
 // Use this to create the instance object passed to abigen v2 library functions Call, Transact, etc.
-func (c *C2) Instance(backend bind.ContractBackend, addr common.Address) *bind.BoundContract {
+func (c *C2) Instance(backend bind.ContractBackend, addr common.Address) bind.BoundContract {
 	return bind.NewContractInstance(backend, addr, c.abi)
 }
 

accounts/abi/bind/v2/internal/contracts/uint256arrayreturn/bindings.go

@@ -45,7 +45,7 @@ func NewMyContract() *MyContract {
 
 // Instance creates a wrapper for a deployed contract instance at the given address.
 // Use this to create the instance object passed to abigen v2 library functions Call, Transact, etc.
-func (c *MyContract) Instance(backend bind.ContractBackend, addr common.Address) *bind.BoundContract {
+func (c *MyContract) Instance(backend bind.ContractBackend, addr common.Address) bind.BoundContract {
 	return bind.NewContractInstance(backend, addr, c.abi)
 }